Update UFS to develop as of 2023 Apr 17

Updates the UFS model hash to the version as of 2023 Apr 17. Some associated changes accompany this update - Restart filenames for MOM6 (ufs-community/ufs-weather-model#1599) - Remove store coriolis setting from MOM6 namelist (ufs-community/ufs-weather-model#1599) - Change in atm 'log' file names (ufs-community/ufs-weather-model#1704) - Additions to diag_table for frozen species (ufs-community/ufs-weather-model#1529) - Restart quilting (ufs-community/ufs-weather-model#1633) - Update to post itag (ufs-community/ufs-weather-model#1690) The switch to restart quilting adds an additional constraint on the size of write groups to be divisible by the number of tiles, so all were increased to the next multiple of 6. In the process of updating the diag tables, unused tables were removed. Closes NOAA-EMC#1445 Closes NOAA-EMC#1499 Partially addresses NOAA-EMC#1277 See also NOAA-EMC#1500
WalterKolczynski-NOAA · Apr 26, 2023 · 1e3e8c7 · 1e3e8c7
1 parent b5d173f
commit 1e3e8c7
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 1,570 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,7 +1,7 @@
 # External sub-modules of global-workflow
 
 [UFS]
-tag = c22aaad
+tag = 2247060
 local_path = sorc/ufs_model.fd
 repo_url = https://github.com/ufs-community/ufs-weather-model.git
 protocol = git

diff --git a/jobs/JGLOBAL_ATMOS_POST b/jobs/JGLOBAL_ATMOS_POST
@@ -80,7 +80,7 @@ fi
 # Specify Restart File Name to Key Off
 #######################################
 # TODO Improve the name of this variable
-export restart_file=${COM_ATMOS_HISTORY}/${RUN}.t${cyc}z.logf
+export restart_file=${COM_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf
 
 ####################################
 # Specify Timeout Behavior of Post

diff --git a/parm/config/config.resources b/parm/config/config.resources
@@ -530,8 +530,7 @@ elif [[ "${step}" = "fcst" || "${step}" = "efcs" ]]; then
         # PETS for quilting
         if [[ "${QUILTING:-}" = ".true." ]]; then
           (( QUILTPETS = ntasks_quilt * nthreads_fv3 ))
-          (( WRTTASK_PER_GROUP = WRTTASK_PER_GROUP * nthreads_fv3 ))  # when threads are used, WRTTASKS_PER_GROUP = INCOMING_WRTTASKS_PER_GROUP * threads
-          # model_configure should be updated to reflect the number of threads used by calling this variable write_pets_per_group
+          (( WRTTASK_PER_GROUP = WRTTASK_PER_GROUP ))
           export WRTTASK_PER_GROUP
         else
           QUILTPETS=0

diff --git a/parm/config/config.ufs b/parm/config/config.ufs
@@ -113,9 +113,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=1
         export cdmbgwd="0.071,2.1,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
-        export WRTTASK_PER_GROUP=2
+        export WRTTASK_PER_GROUP=6
         export WRITE_GROUP_GFS=1
-        export WRTTASK_PER_GROUP_GFS=2
+        export WRTTASK_PER_GROUP_GFS=6
         ;;
     "C96")
         export DELTIM=600
@@ -127,9 +127,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=1
         export cdmbgwd="0.14,1.8,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
-        export WRTTASK_PER_GROUP=4
+        export WRTTASK_PER_GROUP=6
         export WRITE_GROUP_GFS=1
-        export WRTTASK_PER_GROUP_GFS=4
+        export WRTTASK_PER_GROUP_GFS=6
         ;;
     "C192")
         export DELTIM=450
@@ -141,9 +141,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=2
         export cdmbgwd="0.23,1.5,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=1
-        export WRTTASK_PER_GROUP=64
+        export WRTTASK_PER_GROUP=66
         export WRITE_GROUP_GFS=2
-        export WRTTASK_PER_GROUP_GFS=64
+        export WRTTASK_PER_GROUP_GFS=66
         ;;
     "C384")
         export DELTIM=300
@@ -169,9 +169,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.15,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=2
-        export WRTTASK_PER_GROUP=64
+        export WRTTASK_PER_GROUP=66
         export WRITE_GROUP_GFS=4
-        export WRTTASK_PER_GROUP_GFS=64
+        export WRTTASK_PER_GROUP_GFS=66
         ;;
     "C1152")
         export DELTIM=120
@@ -183,9 +183,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.10,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=4
-        export WRTTASK_PER_GROUP=64  # TODO: refine these numbers when a case is available
+        export WRTTASK_PER_GROUP=66  # TODO: refine these numbers when a case is available
         export WRITE_GROUP_GFS=4
-        export WRTTASK_PER_GROUP_GFS=64  # TODO: refine these numbers when a case is available
+        export WRTTASK_PER_GROUP_GFS=66  # TODO: refine these numbers when a case is available
         ;;
     "C3072")
         export DELTIM=90
@@ -197,9 +197,9 @@ case "${fv3_res}" in
         export nthreads_fv3_gfs=4
         export cdmbgwd="4.0,0.05,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export WRITE_GROUP=4
-        export WRTTASK_PER_GROUP=64  # TODO: refine these numbers when a case is available
+        export WRTTASK_PER_GROUP=66  # TODO: refine these numbers when a case is available
         export WRITE_GROUP_GFS=4
-        export WRTTASK_PER_GROUP_GFS=64  # TODO: refine these numbers when a case is available
+        export WRTTASK_PER_GROUP_GFS=66  # TODO: refine these numbers when a case is available
         ;;
     *)
         echo "FATAL ERROR: Unsupported FV3 resolution = ${fv3_res}, ABORT!"

diff --git a/parm/mom6/MOM_input_template_025 b/parm/mom6/MOM_input_template_025
@@ -201,7 +201,6 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
-STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False    !   [Boolean] default = False

diff --git a/parm/mom6/MOM_input_template_050 b/parm/mom6/MOM_input_template_050
@@ -199,7 +199,6 @@ DTFREEZE_DP = -7.75E-08         !   [deg C Pa-1] default = 0.0
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
-STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False    !   [Boolean] default = False

diff --git a/parm/mom6/MOM_input_template_100 b/parm/mom6/MOM_input_template_100
@@ -210,7 +210,6 @@ TFREEZE_FORM = "MILLERO_78"     ! default = "LINEAR"
 PARALLEL_RESTARTFILES = True    !   [Boolean] default = False
                                 ! If true, each processor writes its own restart file, otherwise a single
                                 ! restart file is generated
-STORE_CORIOLIS_ACCEL = False
 
 ! === module MOM_tracer_flow_control ===
 USE_IDEAL_AGE_TRACER = False     !   [Boolean] default = False

diff --git a/parm/mom6/MOM_input_template_500 b/parm/mom6/MOM_input_template_500
@@ -132,7 +132,6 @@ TFREEZE_FORM = "MILLERO_78"     ! default = "LINEAR"
 
 ! === module MOM_restart ===
 RESTART_CHECKSUMS_REQUIRED = False
-STORE_CORIOLIS_ACCEL = False
 ! === module MOM_tracer_flow_control ===
 
 ! === module MOM_coord_initialization ===

diff --git a/parm/parm_fv3diag/diag_table b/parm/parm_fv3diag/diag_table
@@ -100,6 +100,13 @@
 "gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
 
 "gfs_phys",    "cldfra",        "cldfra",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzr",          "frzr",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzrb",         "frzrb",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozr",         "frozr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozrb",        "frozrb",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowp",        "tsnowp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowpb",       "tsnowpb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rhonewsn",      "rhonewsn",      "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "ALBDO_ave",     "albdo_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcp_ave",   "cprat_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcpb_ave",  "cpratb_ave",    "fv3_history2d",  "all",  .false.,  "none",  2

diff --git a/parm/parm_fv3diag/diag_table_cpl b/parm/parm_fv3diag/diag_table_cpl
@@ -103,6 +103,13 @@
 "gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
 
 "gfs_phys",    "cldfra",        "cldfra",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzr",          "frzr",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzrb",         "frzrb",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozr",         "frozr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozrb",        "frozrb",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowp",        "tsnowp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowpb",       "tsnowpb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rhonewsn",      "rhonewsn",      "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "ALBDO_ave",     "albdo_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcp_ave",   "cprat_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcpb_ave",  "cpratb_ave",    "fv3_history2d",  "all",  .false.,  "none",  2

diff --git a/parm/parm_fv3diag/diag_table_da b/parm/parm_fv3diag/diag_table_da
@@ -34,6 +34,13 @@
 "gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
 
 "gfs_phys",    "cldfra",        "cldfra",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzr",          "frzr",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzrb",         "frzrb",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozr",         "frozr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozrb",        "frozrb",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowp",        "tsnowp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowpb",       "tsnowpb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rhonewsn",      "rhonewsn",      "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "ALBDO_ave",     "albdo_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcp_ave",   "cprat_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_phys",    "cnvprcpb_ave",  "cpratb_ave",    "fv3_history2d",  "all",  .false.,  "none",  2