Merge branch 'ufs-community:develop' into cpld_s2sw_wavice

CICE-interface/CMakeLists.txt

@@ -39,7 +39,7 @@ else()
 endif()
 
 # Configuration Options
-set(CICE_IO "NetCDF" CACHE STRING "CICE OPTIONS: Choose IO options.")
+set(CICE_IO "PIO" CACHE STRING "CICE OPTIONS: Choose IO options.")
 set_property(CACHE CICE_IO PROPERTY STRINGS "NetCDF" "PIO" "Binary")
 
 # Too many files to list, so include them via this file

doc/UsersGuide/requirements.txt

@@ -18,7 +18,7 @@ docutils==0.20.1
  # sphinx
  # sphinx-rtd-theme
  # sphinxcontrib-bibtex
-idna==3.6
+idna==3.7
  # via requests
 imagesize==1.4.1
  # via sphinx

doc/UsersGuide/source/FAQ.rst

@@ -166,7 +166,7 @@ options:
 MOM6, CICE6 and CMEPS restart files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In ``nems.configure``, set the ALLCOMP_attribute ``restart_n`` to a
+In ``ufs.configure``, set the ALLCOMP_attribute ``restart_n`` to a
 value greater than the forecast length.
 
 MOM6 history files
@@ -229,11 +229,11 @@ How do I set the total number of tasks for my job?
 In the UFS WM, each component's MPI task information, including the
 starting and ending tasks and the number of threads, are specified
 using the component-specific ``petlist_bounds`` and
-``omp_num_threads`` in ``nems.configure``. In general, the total
+``omp_num_threads`` in ``ufs.configure``. In general, the total
 number of MPI tasks required is the sum of all the sub-component
 tasks, as long as those components do not overlap (i.e., share the
 same PETs). An example of a global 5 component coupled configuration
-nems.configure at the end of this section.
+ufs.configure at the end of this section.
 
 FV3atm
 ^^^^^^
@@ -286,7 +286,7 @@ If ESMF-managed threading is used, the total number of PETs for the
 atmosphere component is given by the product of the number of threads
 requested and the total number of MPI ranks (both forecast and write
 grid component). If ``num_threads_atm`` is the number of threads
-specified for the FV3atm component, in ``nems.configure`` the ATM PET
+specified for the FV3atm component, in ``ufs.configure`` the ATM PET
 bounds are given by
 
 ::
@@ -295,7 +295,7 @@ bounds are given by
  ATM_omp_num_threads num_threads_atm
 
 Note that in UWM, the ATM component is normally listed first in
-``nems.configure`` so that the starting PET for the ATM is 0.
+``ufs.configure`` so that the starting PET for the ATM is 0.
 
 GOCART
 ^^^^^^
@@ -330,7 +330,7 @@ MPI tasks for CMEPS is given by
 
  total_tasks_med = smaller of (300, FV3atm forecast tasks)
 
-and in ``nems.configure``
+and in ``ufs.configure``
 
 ::
 
@@ -342,7 +342,7 @@ MOM6
 
 For MOM6 the only restriction currently on the number of MPI ranks
 used by MOM6 is that it is divisible by 2. The starting PET in
-``nems.configure`` will be the last PET of the preceding component,
+``ufs.configure`` will be the last PET of the preceding component,
 incremented by one. Threading in MOM6 is not recommended at this time.
 
 ::
@@ -388,14 +388,14 @@ For the 1-deg CICE domain for example, ``ice_in`` would be
 
 
 In UFS, only a single thread is used for CICE so for ``nprocs`` set in
-``ice_in``, the tasks in ``nems.configure`` are set as:
+``ice_in``, the tasks in ``ufs.configure`` are set as:
 
 ::
 
  ICE_petlist_bounds: starting_ICE_PET nprocs+starting_ICE_PET-1
  ICE_omp_num_threads: 1
 
-The starting ICE PET in ``nems.configure`` will be the last PET of the
+The starting ICE PET in ``ufs.configure`` will be the last PET of the
 preceding component, incremented by one.
 
 WW3
@@ -409,20 +409,20 @@ for WW3 and the number of threads to be used.
  WAV_petlist_bounds: starting_WAV_PET num_tasks_wav*num_threads_wav+starting_WAV_PET-1
  WAV_omp_num_threads: num_threads_wav
 
-The starting WAV PET in ``nems.configure`` will be the last PET of the
+The starting WAV PET in ``ufs.configure`` will be the last PET of the
 preceding component, incremented by one.
 
 
-Example: 5-component nems.configure
+Example: 5-component ufs.configure
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For the fully coupled S2SWA application, a sample ``nems.configure`` is shown below :
+For the fully coupled S2SWA application, a sample ``ufs.configure`` is shown below :
 
 
 .. code-block:: console
 
  #############################################
- #### NEMS Run-Time Configuration File #####
+ #### UFS Run-Time Configuration File #####
  #############################################
 
  # ESMF #

doc/UsersGuide/source/InputsOutputs.rst

@@ -2288,7 +2288,7 @@ on the monthly, daily, hourly, yearly or timestep intervals set by the *histfreq
 *0* for both monthly and daily frequencies and neither yearly nor per-timestep output is requested, only 6-hour
 mean history files will be produced.
 
-Further details of the configuration of CICE model output can be found in the CICE documentation `Section 3.1.4 <https://cice-consortium-cice.readthedocs.io/en/main/user_guide/ug_implementation.html#model-output>`__.
+Further details of the configuration of CICE model output can be found in the CICE documentation `Section 3.1.4 <https://cice-consortium-cice.readthedocs.io/en/main/user_guide/ug_implementation.html#model-input-and-output>`__.
 
 .. _ww3-out:
 

doc/UsersGuide/source/Introduction.rst

@@ -47,7 +47,7 @@ The UFS WM code is portable and can be used with Linux or Mac operating systems
 
 Those wishing to contribute development to the UFS WM should become familiar with the procedures for running the model as a standalone component and for executing the regression tests described in the UFS WM GitHub `wiki <https://github.com/ufs-community/ufs-weather-model/wiki/Making-code-changes-in-the-UFS-weather-model-and-its-subcomponents>`__ to make sure no inadvertent changes to the results have been introduced during the development process.
 
-Support for the UFS WM is provided through the `UFS Forum <https://forums.ufscommunity.org/forum/ufs-weather-model>`__ by the Developmental Testbed Center (DTC) and other groups involved in UFS development, such as NOAA's Environmental Modeling Center (:term:`EMC`), NOAA research laboratories (GFDL, NSSL, ESRL, and AOML), and :term:`NCAR`. UFS users and developers are encouraged not only to post questions, but also to help address questions posted by other members of the community.
+Support for the UFS WM is provided through the `UFS Forum <https://github.com/ufs-community/ufs-weather-model/discussions>`__ by the Developmental Testbed Center (DTC) and other groups involved in UFS development, such as NOAA's Environmental Modeling Center (:term:`EMC`), NOAA research laboratories (GFDL, NSSL, ESRL, and AOML), and :term:`NCAR`. UFS users and developers are encouraged not only to post questions, but also to help address questions posted by other members of the community.
 
 This WM User's Guide is organized as follows:
 
@@ -57,6 +57,8 @@ This WM User's Guide is organized as follows:
 
  * :numref:`Chapter %s <InputsOutputs>` (Data: Input, Model Configuration, and Output Files) lists the model inputs and outputs and has a description of the key files.
 
+ * :numref:`Chapter %s <Configurations>` (Configurations) lists the currently supported configurations for the UFS WM.
+
  * :numref:`Chapter %s <ConfigParams>` (Configuration Parameters) lists the purpose and valid values for various configuration parameters.
 
  * :numref:`Chapter %s <AutomatedTesting>` (Automated Testing) describes UFS WM automated testing options.

doc/UsersGuide/source/conf.py

@@ -69,9 +69,12 @@
 # The master toctree document.
 master_doc = 'index'
 
-# The language for content autogenerated by Sphinx. 
-# Not set because default is 'en'.
-# language = 'en'
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20240401
+export BL_DATE=20240408

tests/default_vars.sh

@@ -654,6 +654,28 @@ export CICE_RUNID=unknown
 export CICE_USE_RESTART_TIME=.false.
 export CICE_RESTART_DIR=./RESTART/
 export CICE_RESTART_FILE=iced
+
+export CICE_RESTART_FORMAT='pnetcdf2'
+export CICE_RESTART_IOTASKS=-99
+export CICE_RESTART_REARR='box'
+export CICE_RESTART_ROOT=-99
+export CICE_RESTART_STRIDE=-99
+export CICE_RESTART_CHUNK=0,0
+export CICE_RESTART_DEFLATE=0
+
+export CICE_HISTORY_FORMAT='pnetcdf2'
+if [[ ${MACHINE_ID} == wcoss2 ]]; then
+ export CICE_RESTART_FORMAT='hdf5'
+ export CICE_HISTORY_FORMAT='hdf5'
+fi
+export CICE_HISTORY_IOTASKS=-99
+export CICE_HISTORY_REARR='box'
+export CICE_HISTORY_ROOT=-99
+export CICE_HISTORY_STRIDE=-99
+export CICE_HISTORY_CHUNK=0,0
+export CICE_HISTORY_DEFLATE=0
+export CICE_HISTORY_PREC=4
+
 export CICE_DUMPFREQ=d
 export CICE_DUMPFREQ_N=1000
 export CICE_DIAGFREQ=`expr $FHMAX \* 3600 / $DT_CICE`

tests/logs/OpnReqTests_control_p8_hera.log

@@ -1,9 +1,9 @@
-Thu Apr  4 13:45:26 UTC 2024
+Fri Apr 12 15:33:44 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/bit_base_bit_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 273.384410
- 0: The maximum resident set size (KB) = 1252756
+ 0: The total amount of wall time = 268.779052
+ 0: The maximum resident set size (KB) = 1266844
 
 Test bit_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/dbg_base_dbg_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 948.187410
- 0: The maximum resident set size (KB) = 1232512
+ 0: The total amount of wall time = 954.578049
+ 0: The maximum resident set size (KB) = 1253880
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/dcp_dcp
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 246.989736
- 0: The maximum resident set size (KB) = 1235588
+ 0: The total amount of wall time = 246.936524
+ 0: The maximum resident set size (KB) = 1247528
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/mpi_mpi
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 243.345326
- 0: The maximum resident set size (KB) = 1230288
+ 0: The total amount of wall time = 242.865330
+ 0: The maximum resident set size (KB) = 1248864
 
 Test mpi PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/rst_rst
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 243.496287
- 0: The maximum resident set size (KB) = 1237700
+ 0: The total amount of wall time = 238.898069
+ 0: The maximum resident set size (KB) = 1246768
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/std_base_std_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time = 238.877192
- 0: The maximum resident set size (KB) = 1230820
+ 0: The total amount of wall time = 237.211758
+ 0: The maximum resident set size (KB) = 1248264
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_478288/thr_thr
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3669664/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 239.056770
- 0: The maximum resident set size (KB) = 1231348
+ 0: The total amount of wall time = 244.451475
+ 0: The maximum resident set size (KB) = 1243996
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Thu Apr  4 14:57:18 UTC 2024
-Elapsed time: 01h:11m:52s. Have a nice day!
+Fri Apr 12 16:48:07 UTC 2024
+Elapsed time: 01h:14m:24s. Have a nice day!

tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log

@@ -1,9 +1,9 @@
-Thu Apr 4 18:07:00 UTC 2024
+Mon Apr 8 19:23:40 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/dbg_base_dbg_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2519701/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time = 1344.317893
- 0: The maximum resident set size (KB) = 1342820
+ 0: The total amount of wall time = 1341.650023
+ 0: The maximum resident set size (KB) = 1370360
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/rst_rst
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2519701/rst_rst
 Checking test rst results ....
  Comparing sfcf021.tile1.nc .....USING NCCMP......OK
  Comparing sfcf021.tile2.nc .....USING NCCMP......OK
@@ -135,14 +135,14 @@ Checking test rst results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK
 
- 0: The total amount of wall time = 391.350241
- 0: The maximum resident set size (KB) = 1343528
+ 0: The total amount of wall time = 389.411111
+ 0: The maximum resident set size (KB) = 1359432
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
-working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1261607/std_base_std_base
+working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2519701/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf021.tile1.nc .........OK
@@ -205,11 +205,11 @@ Moving baseline std_base files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time = 389.898125
- 0: The maximum resident set size (KB) = 1341344
+ 0: The total amount of wall time = 388.613517
+ 0: The maximum resident set size (KB) = 1359920
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Thu Apr 4 19:08:57 UTC 2024
-Elapsed time: 01h:01m:57s. Have a nice day!
+Mon Apr 8 20:26:41 UTC 2024
+Elapsed time: 01h:03m:01s. Have a nice day!