Merge branch 'develop' into feature/pio4ww3

DeniseWorthen · Nov 1, 2024 · a459a4f · a459a4f
2 parents c0dd7ea + 1f53677
commit a459a4f
Showing 47 changed files with 3,034 additions and 2,048 deletions.
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241024
+export BL_DATE=20241028
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -296,11 +296,10 @@ COMPILE | datm_cdeps_lm4 | intel | -DAPP=LND-LM4 | + hera orion gaea | fv3 |
 RUN     | datm_cdeps_lm4_gswp3                          | + hera orion gaea  | baseline |
 RUN     | datm_cdeps_lm4_gswp3_rst                      | + hera orion gaea  |          | datm_cdeps_lm4_gswp3
 
-
 ### AMIP+ tests ###
 COMPILE | atm_ds2s_docn_pcice | intel | -DAPP=ATM_DS2S-PCICE -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
 RUN | atm_ds2s_docn_pcice                               | - noaacloud                          | baseline |
-COMPILE | atm_ds2s_docn_dice | intel | -DAPP=ATM_DS2S  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8    | - wcoss2 acorn  | fv3 |
+COMPILE | atm_ds2s_docn_dice | intel | -DAPP=ATM_DS2S  -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | - wcoss2 acorn  | fv3 |
 RUN | atm_ds2s_docn_dice                                | - noaacloud wcoss2 acorn             | baseline | cpld_control_nowave_noaero_p8
 
 ### ATM-LND tests ###

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -339,6 +339,22 @@ if [[ ${FIRE_BEHAVIOR} = 'true' ]]; then
   atparse < "${PATHRT}/parm/${FIRE_NML:-namelist.fire.IN}" > namelist.fire
 fi
 
+#Namelists generated and variable definitions are finalized
+#Sanity check for timesteps on ATM/OCN/ICE
+if [[ -n "${DT_CICE+x}" ]]; then
+  if [[ ${DT_ATMOS} -ne ${DT_CICE} ]]; then
+    echo "Atmosphere timestep (DT_ATMOS) should be equal to CICE timestep (DT_CICE). Exiting"
+    exit 1
+  fi
+fi
+if [[ -n "${coupling_interval_slow_sec+x}" && -n "${coupling_interval_fast_sec+x}" ]]; then
+  if [[ $(( coupling_interval_slow_sec % coupling_interval_fast_sec)) -ne 0 ]]; then
+    echo "The slow coupling timestep (coupling_interval_slow_sec) should be divisible by"
+    echo "the fast coupling timestep (coupling_interval_fast_sec). Exiting"
+    exit 1
+  fi
+fi
+
 TPN=$(( TPN / THRD ))
 if (( TASKS < TPN )); then
   TPN=${TASKS}

diff --git a/tests/tests/atm_ds2s_docn_dice b/tests/tests/atm_ds2s_docn_dice
@@ -64,7 +64,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
 
+export DT_ATMOS=720
+
 export_fv3
+export_ugwpv1
 export_cpl
 
 #Component settings
@@ -112,10 +115,21 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export CCPP_SUITE=FV3_GFS_v17_coupled_p8
+export K_SPLIT=4
+export N_SPLIT=5
+
+# HR4 GFSv17 GWD update
+export DO_GWD_OPT_PSL=.true.
+export DO_GSL_DRAG_SS=.false.
+
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export DIAG_TABLE=diag_table_gfsv16
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export INPUT_NML=global_control.nml.IN
 export MODEL_CONFIGURE=model_configure.IN
 export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 export FV3_RUN="cpld_control_run.IN cpld_docn_dice.IN"
+
+if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = hercules ]] || [[ $MACHINE_ID = orion ]] || [[ $MACHINE_ID = gaea ]]; then
+  WLCLK=50
+fi
diff --git a/tests/tests/control_p8_mynn b/tests/tests/control_p8_mynn
@@ -93,6 +93,12 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
+export FAST_TAU_W_SEC=0.2
+export RF_CUTOFF=10.
+export ISATMEDMF=1
+export LRADAR=.false.
+export LTAEROSOL=.false.
+
 # UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.

diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -96,8 +97,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -51,10 +51,11 @@ export LIST_FILES="sfcf006.nc \
                    ufs.cpld.ww3.r.2013-04-01-21600.nc \
                    20130401.060000.out_pnt.ww3 \
                    20130401.060000.out_grd.ww3 "
+export ATMRES=C384
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013
@@ -90,7 +91,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
 export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
-export ATMRES=C384
 export NPX=385
 export NPY=385
 export IMO=1536

diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
@@ -7,6 +7,8 @@ export CNTL_DIR=cpld_bmark_p8
 
 export LIST_FILES=""
 
+export ATMRES=C384
+
 export_fv3
 export_cpl
 
@@ -43,7 +45,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
 export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
-export ATMRES=C384
 export NPX=385
 export NPY=385
 export IMO=1536

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -57,9 +57,13 @@ export LIST_FILES="sfcf030.tile1.nc \
                    20210323.120000.out_grd.ww3 \
                    20210323.120000.out_pnt.ww3 "
 
+export ATMRES=C192
 export_fv3
+export_ugwpv1
 export_cpl
 
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
+
 export DAYS=1.25
 export FHMAX=30
 export RESTART_N=15
@@ -83,7 +87,6 @@ export chm_omp_num_threads=$atm_omp_num_threads
 export med_omp_num_threads=$atm_omp_num_threads
 
 # atm/ocn/ice resolution
-export ATMRES=C192
 export NPX=193
 export NPY=193
 export IMO=768
@@ -135,8 +138,6 @@ export FNVMXC="'C192.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C192.slope_type.tileX.nc'"
 export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 
-export CDMBWD=${CDMBWD_c192}
-
 export FV3_RUN=cpld_control_run.IN
 
 if [[ $MACHINE_ID = derecho ]]; then

diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48
@@ -52,11 +52,11 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/20210323.060000.MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
+export ATMRES=C48
 
 export_fv3
-export_cpl
 export_ugwpv1
-
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -74,7 +74,6 @@ OCN_tasks=$OCN_tasks_cpl_c48
 ICE_tasks=$ICE_tasks_cpl_c48
 
 # atm/ocn/ice resolution
-export ATMRES=C48
 export NPX=49
 export NPY=49
 export IMO=192

diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
@@ -69,10 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
-
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -87,8 +87,6 @@ export CICE_GRIDICE=C
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
@@ -72,8 +72,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
@@ -53,8 +53,8 @@ export LIST_FILES="sfcf024.nc \
                    20210323.120000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12

diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
@@ -67,10 +67,11 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
 
 #TODO: add comparison of CA restart files?
+export DT_ATMOS=720
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -107,7 +108,7 @@ export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -69,10 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
 		   ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
-
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -89,8 +89,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
@@ -70,9 +70,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -90,8 +91,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_p8_faster b/tests/tests/cpld_control_p8_faster
@@ -70,9 +70,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -85,8 +86,6 @@ export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_p8_mixedmode b/tests/tests/cpld_control_p8_mixedmode
@@ -70,9 +70,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -85,8 +86,6 @@ export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -69,9 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -105,15 +106,13 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
+if [[ $MACHINE_ID = orion ]] || [[ $RT_COMPILER = gnu ]]; then
+  WLCLK=50
 fi
 if [[ $MACHINE_ID = hercules && $RT_COMPILER = gnu ]]; then
  export WW3_PIO_REARR='box'
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_qr_p8 b/tests/tests/cpld_control_qr_p8
@@ -69,10 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
-
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export QUILTING_RESTART=.true.
@@ -86,8 +86,6 @@ export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs
@@ -18,19 +18,23 @@ export LIST_FILES="sfcf021.nc \
                    RESTART/20210323.060000.MOM.res.nc"
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0
 export MAKE_NH=.false.
 export DDDMP=0
 export DO_VORT_DAMP=.false.
 export HYDROSTATIC=.true.
-export HORD_XX=10
 export HORD_DP=10
-export KORD_XX=12
 export KORD_TM=-12
+export KORD_MT=12
+export KORD_WZ=12
+export KORD_TR=12
+export HORD_MT=10
+export HORD_VT=10
+export HORD_TM=10
 export D_CON=0
 
 export RESTART_N=3

diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
@@ -56,10 +56,10 @@ export LIST_FILES="sfcf003.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
-
+export DT_ATMOS=360
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export FHMAX=3
 export DAYS=0.125
@@ -106,8 +106,6 @@ export WW3_RSTFLDS="ice"
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=360
-export DT_ATMOS=360
 export K_SPLIT=2
 export N_SPLIT=5
 
@@ -117,6 +115,9 @@ fi
 if [[ $MACHINE_ID = gaea ]] && [[ $RT_COMPILER = intelllvm ]]; then
   WLCLK=40
 fi
+if [[ $MACHINE_ID = orion ]]; then
+  WLCLK=40
+fi
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3
@@ -80,8 +81,6 @@ if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -57,9 +57,10 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHMAX=3
@@ -99,19 +100,24 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-if [[ $MACHINE_ID = hera && $RT_COMPILER = gnu ]] || [[ $MACHINE_ID = jet ]]; then
+if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = jet ]]; then
   WLCLK=50
 fi
 if [[ $MACHINE_ID = hercules && $RT_COMPILER = intelllvm ]]; then
   WLCLK=50
 fi
-if [[ $MACHINE_ID = orion && $RT_COMPILER = intelllvm ]]; then
+if [[ $MACHINE_ID = orion ]]; then
+  WLCLK=50
+fi
+if [[ $MACHINE_ID = gaea ]]; then
   WLCLK=50
 fi
-if [[ $MACHINE_ID = gaea ]] && [[ $RT_COMPILER = intelllvm ]]; then
+if [[ $MACHINE_ID = wcoss2 ]]; then
   WLCLK=50
 fi
 
+# set component and coupling timesteps due to long
+# runtime
 export K_SPLIT=2
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -90,8 +91,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
@@ -72,8 +72,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -90,8 +91,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8
@@ -68,10 +68,10 @@ export LIST_FILES="sfcf021.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
-
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -108,11 +108,16 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
+
+if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = orion ]]; then
+  WLCLK=50
+fi
+if [[ $MACHINE_ID = wcoss2 ]]; then
+  WLCLK=50
+fi
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -51,10 +51,10 @@ export LIST_FILES="sfcf006.nc \
                    ufs.cpld.ww3.r.2013-04-01-21600.nc \
                    20130401.060000.out_pnt.ww3 \
                    20130401.060000.out_grd.ww3 "
-
+export ATMRES=C384
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013
@@ -94,7 +94,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
 export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
-export ATMRES=C384
 export NPX=385
 export NPY=385
 export IMO=1536

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -57,8 +57,11 @@ export LIST_FILES="sfcf030.tile1.nc \
                    20210323.120000.out_grd.ww3 \
                    20210323.120000.out_pnt.ww3 "
 
+export ATMRES=C192
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export DAYS=1.25
 export FHMAX=30
@@ -85,7 +88,6 @@ export chm_omp_num_threads=$atm_omp_num_threads
 export med_omp_num_threads=$atm_omp_num_threads
 
 # atm/ocn/ice resolution
-export ATMRES=C192
 export NPX=193
 export NPY=193
 export IMO=768

diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48
@@ -53,8 +53,11 @@ export LIST_FILES="sfcf006.tile1.nc \
                    RESTART/iced.2021-03-23-43200.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc"
 
+export ATMRES=C48
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2021
 export SMONTH=03
@@ -86,7 +89,6 @@ OCN_tasks=$OCN_tasks_cpl_c48
 ICE_tasks=$ICE_tasks_cpl_c48
 
 # atm/ocn/ice resolution
-export ATMRES=C48
 export NPX=49
 export NPY=49
 export IMO=192
@@ -171,9 +173,5 @@ export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN
 export FV3_RUN=cpld_control_run.IN
 
 # HR4 GFSv17 GWD update
-export DO_UGWP_V0=.false.
-export DO_UGWP_V1=.true.
-export DO_GSL_DRAG_LS_BL=.true.
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
-export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
@@ -60,8 +60,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHROT=12
@@ -96,8 +97,6 @@ if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
 fi
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8
@@ -56,10 +56,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-23-21600.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
-
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export FHROT=12
@@ -112,8 +112,6 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_restart_qr_p8 b/tests/tests/cpld_restart_qr_p8
@@ -58,9 +58,10 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_pnt.ww3 \
                    20210323.060000.out_grd.ww3 "
 
+export DT_ATMOS=720
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export QUILTING_RESTART=.true.
@@ -93,8 +94,6 @@ export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export FV3_RUN=cpld_control_run.IN
 
-export DT_INNER=720
-export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_s2sa_p8 b/tests/tests/cpld_s2sa_p8
@@ -56,7 +56,9 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
 
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"

diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48
@@ -53,8 +53,11 @@ export LIST_FILES="sfcf006.tile1.nc \
                    RESTART/iced.2021-03-23-43200.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc"
 
+export ATMRES=C48
 export_fv3
+export_ugwpv1
 export_cpl
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2021
 export SMONTH=03
@@ -83,7 +86,6 @@ OCN_tasks=$OCN_tasks_cpl_c48
 ICE_tasks=$ICE_tasks_cpl_c48
 
 # atm/ocn/ice resolution
-export ATMRES=C48
 export NPX=49
 export NPY=49
 export IMO=192