ufs-community · DeniseWorthen · Apr 18, 2022 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1064,7 +1064,7 @@ export HAFS=false
 export DATM_CDEPS=false
 export DOCN_CDEPS=false
 
-export FV3BMIC='gfs_p8a'
+export FV3BMIC='gfs_p8c'
 
 export SYEAR=2021
 export SMONTH=03

diff --git a/tests/parm/MOM_input_template_100 b/tests/parm/MOM_input_template_100
@@ -163,7 +163,7 @@ TOPO_CONFIG = "file"            !
                                 !     Phillips - ACC-like idealized topography used in the Phillips config.
                                 !     dense - Denmark Strait-like dense water formation and overflow.
                                 !     USER - call a user modified routine.
-TOPO_EDITS_FILE = "topo_edits_011818.nc" ! default = ""
+TOPO_EDITS_FILE = "@[TOPOEDITS]" ! default = ""
                                 ! The file from which to read a list of i,j,z topography overrides.
 ALLOW_LANDMASK_CHANGES = @[MOM6_ALLOW_LANDMASK_CHANGES]   ! default = "False"
                                 ! If true, allow topography overrides to change ocean points to land
@@ -856,8 +856,8 @@ FIX_USTAR_GUSTLESS_BUG = False  !   [Boolean] default = True
                                 ! velocity
 ! === module ocean_stochastics ===
 DO_SPPT   = @[DO_OCN_SPPT]      ! [Boolean] default = False
-                                ! If true perturb the diabatic tendencies in MOM_diabadic_driver 
-PERT_EPBL = @[PERT_EPBL]        ! [Boolean] default = False 
+                                ! If true perturb the diabatic tendencies in MOM_diabadic_driver
+PERT_EPBL = @[PERT_EPBL]        ! [Boolean] default = False
                                 ! If true perturb the KE dissipation and destruction in MOM_energetic_PBL
 
 ! === module MOM_restart ===

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -163,7 +163,7 @@ RUN     | hafs_regional_telescopic_2nests_atm
 RUN     | hafs_global_1nest_atm                                                                                                   | - jet.intel wcoss2                      | fv3 |
 RUN     | hafs_global_multiple_4nests_atm                                                                                         | - jet.intel wcoss_cray wcoss2           | fv3 |
 RUN     | hafs_regional_specified_moving_1nest_atm                                                                                | - jet.intel wcoss2                      | fv3 |
-RUN     | hafs_regional_storm_following_1nest_atm                                                                                 | - jet.intel wcoss2                      | fv3 |
+RUN     | hafs_regional_storm_following_1nest_atm                                                                                 | - jet.intel wcoss2 hera.intel           | fv3 |
 RUN     | hafs_regional_storm_following_1nest_atm_ocn                                                                             | - jet.intel wcoss2                      | fv3 |
 RUN     | hafs_regional_storm_following_1nest_atm_ocn_wav                                                                         | - jet.intel wcoss2                      | fv3 |
 RUN     | hafs_global_storm_following_1nest_atm                                                                                   | - jet.intel wcoss2                      | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,14 +485,14 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220408
+BL_DATE=20220414
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}}
 fi
 
-INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211210}
+INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
 INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}
 

diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -84,6 +84,8 @@ export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
 export eps_imesh=2.5e-1
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN

diff --git a/tests/tests/cpld_control_c96_noaero_p8 b/tests/tests/cpld_control_c96_noaero_p8
@@ -97,6 +97,9 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 export eps_imesh=2.5e-1
 
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export DIAG_TABLE=diag_table_template
 export NEMS_CONFIGURE=nems.configure.cpld.IN
 

diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
@@ -97,6 +97,8 @@ export ice_petlist_bounds=$IPB_cpl_c96
 export CPLWAV=.false.
 export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export CPLCHM=.true.

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -82,5 +82,7 @@ export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export eps_imesh=2.5e-1
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -87,4 +87,7 @@ export MOM6_USE_WAVES=False
 export DIAG_TABLE=diag_table_template
 export NEMS_CONFIGURE=nems.configure.cpld.IN
 
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -63,6 +63,8 @@ export FHMAX=6
 
 export RESTART_N=${FHMAX}
 export eps_imesh=2.5e-1
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export TASKS=$TASKS_cpl_c96
 export TPN=$TPN_cpl_c96
@@ -85,6 +87,8 @@ export ice_petlist_bounds=$IPB_cpl_c96
 export CPLWAV=.false.
 export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN

diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -88,5 +88,7 @@ export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export eps_imesh=2.5e-1
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -83,6 +83,8 @@ export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
 export CPLCHM=.true.

diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
@@ -104,6 +104,8 @@ export CPLWAV=.false.
 export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 export eps_imesh=2.5e-1
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 
 export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_aero.IN

diff --git a/tests/tests/datm_cdeps_3072x1536_cfsr b/tests/tests/datm_cdeps_3072x1536_cfsr
@@ -25,4 +25,7 @@ export atm_datamode=GFS
 export RESTART_N=12
 export stream_files="DATM_INPUT/cfsr.2011100100_3072x1536.nc DATM_INPUT/cfsr.2011100106_3072x1536.nc DATM_INPUT/cfsr.2011100112_3072x1536.nc DATM_INPUT/cfsr.2011100118_3072x1536.nc DATM_INPUT/cfsr.2011100200_3072x1536.nc DATM_INPUT/cfsr.2011100206_3072x1536.nc"
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_bulk_cfsr b/tests/tests/datm_cdeps_bulk_cfsr
@@ -18,4 +18,7 @@ export JATM=880
 export RESTART_N=12
 export flux_scheme='-1'
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_bulk_gefs b/tests/tests/datm_cdeps_bulk_gefs
@@ -27,4 +27,7 @@ export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 export RESTART_N=12
 export flux_scheme='-1'
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_control_cfsr b/tests/tests/datm_cdeps_control_cfsr
@@ -17,4 +17,7 @@ export IATM=1760
 export JATM=880
 export RESTART_N=12
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_control_gefs b/tests/tests/datm_cdeps_control_gefs
@@ -26,4 +26,6 @@ export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 export RESTART_N=12
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_debug_cfsr b/tests/tests/datm_cdeps_debug_cfsr
@@ -19,4 +19,6 @@ export DAYS="0.25"
 export FHMAX=6
 export RESTART_N=${FHMAX}
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_gfs b/tests/tests/datm_cdeps_gfs
@@ -31,4 +31,7 @@ export TFREEZE_OPTION=mushy
 export RESTART_N=12
 export stream_files="DATM_INPUT/gfs.202103.nc"
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps_gfs.IN
diff --git a/tests/tests/datm_cdeps_iau_gefs b/tests/tests/datm_cdeps_iau_gefs
@@ -27,4 +27,7 @@ export MESH_ATM="DATM_INPUT/${mesh_file}"
 export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
 export RESTART_N=12
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_multiple_files_cfsr b/tests/tests/datm_cdeps_multiple_files_cfsr
@@ -16,4 +16,6 @@ export JATM=880
 export RESTART_N=12
 export stream_files="DATM_INPUT/cfsr.2011100100.nc DATM_INPUT/cfsr.2011100106.nc DATM_INPUT/cfsr.2011100112.nc DATM_INPUT/cfsr.2011100118.nc DATM_INPUT/cfsr.2011100200.nc DATM_INPUT/cfsr.2011100206.nc"
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_restart_cfsr b/tests/tests/datm_cdeps_restart_cfsr
@@ -25,4 +25,6 @@ export RUNTYPE='continue'
 export USE_RESTART_TIME='.true.'
 export MOM6_RESTART_SETTING="r"
 export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/datm_cdeps_stochy_gefs b/tests/tests/datm_cdeps_stochy_gefs
@@ -30,4 +30,6 @@ export FV3_RUN=cpld_datm_cdeps.IN
 export DO_OCN_SPPT="True"
 export PERT_EPBL="True"
 export OCN_SPPT=1.0
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
 export EPBL=1.0