Move sfc emis alb calculation to its own scheme and make z0 composite…

… consistent (ufs-community#529) Substantial changes to CCPP physics to move surface emissivity/albedo calculation to its own scheme and to make surface roughness length composite consistent when fractional landmask is used. Updates to FV3GFS_io.F90 to write additional fields to the restart files (this requires removing the UGWPv1 warmstart test). Additional changes: Bug fixes for coupled model for GNU from @DeniseWorthen Bug fixes for 35-day runs from @DeniseWorthen Update for CI tests from @MinsukJi-NOAA
mzhangw · May 28, 2021 · 177ea10 · 177ea10
1 parent d0f0324
commit 177ea10
Show file tree

Hide file tree

Showing 45 changed files with 4,579 additions and 6,240 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
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/ci/repo_check.sh b/tests/ci/repo_check.sh
@@ -56,7 +56,7 @@ datm[branch]='develop'
 datm[dir]='DATM'
 
 cdeps[repo]='https://github.com/NOAA-EMC/CDEPS'
-cdeps[branch]='emc/develop'
+cdeps[branch]='develop'
 cdeps[dir]='CDEPS-interface/CDEPS'
 
 cmake[repo]='https://github.com/NOAA-EMC/CMakeModules'

diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
@@ -15,6 +15,8 @@ elif [[ @[NPZ] == '127' ]]; then
 else
   FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
 fi
+#unused unless 35D run is active
+WW3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
 
 # FV3 fixed input
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
@@ -53,7 +55,7 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ww3/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
   fi
 fi
 

diff --git a/tests/fv3_conf/cpld_bmark_tiled_run.IN b/tests/fv3_conf/cpld_bmark_tiled_run.IN
@@ -9,6 +9,8 @@ fi
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
 
 FV3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
+#unused unless 35D run is active
+WW3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
 
 # FV3 fixed input
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
@@ -54,7 +56,7 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ww3/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
   fi
 fi
 

diff --git a/tests/parm/gsd_sar.nml.IN b/tests/parm/gsd_sar.nml.IN
@@ -154,8 +154,8 @@
      pdfcld         = .false.
      fhswr          = 3600.
      fhlwr          = 3600.
-     ialb           = 1
-     iems           = 1
+     ialb           = @[IALB]
+     iems           = @[IEMS]
      iaer           = 111
      ico2           = 2
      isubc_sw       = 2

diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN
@@ -17,7 +17,7 @@
   fhout = @[NFHOUT]
   fhmaxhf = @[NFHMAX_HF]
   fhouthf = @[NFHOUT_HF]
-  ccpp_suite = @[CCPP_SUITE]
+  ccpp_suite = '@[CCPP_SUITE]'
 
 /
 

diff --git a/tests/parm/input.benchmark_v16.nml.IN b/tests/parm/input.benchmark_v16.nml.IN
@@ -17,7 +17,7 @@
   fhout = @[NFHOUT]
   fhmaxhf = @[NFHMAX_HF]
   fhouthf = @[NFHOUT_HF]
-  ccpp_suite = @[CCPP_SUITE]
+  ccpp_suite = '@[CCPP_SUITE]'
 
 /
 

diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
@@ -16,7 +16,7 @@
        fhout = @[NFHOUT]
        fhmaxhf = @[NFHMAX_HF]
        fhouthf = @[NFHOUT_HF]
-       ccpp_suite = @[CCPP_SUITE]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml

diff --git a/tests/parm/v16_c96_ugwpv1.nml.IN b/tests/parm/v16_c96_ugwpv1.nml.IN
@@ -13,7 +13,7 @@
   dycore_only = .false.
   fdiag = 3
   fhmax = 24
-  ccpp_suite = 'FV3_GFS_v16b_ugwpv1'
+  ccpp_suite = 'FV3_GFS_v16_ugwpv1'
 /
 
 &diag_manager_nml

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -135,19 +135,18 @@ COMPILE | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_
 RUN     | fv3_gocart_clm                                                                                                          |                                         | fv3 |
 RUN     | fv3_gfs_v16_flake                                                                                                       |                                         | fv3 |
 
-COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                   |                                         | fv3 |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras                                    |                                         | fv3 |
 RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                                         | fv3 |
 #RUN     | fv3_HAFS_v0_hwrf                                                                                                       |                                         | fv3 |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                                         | fv3 |
 RUN     | fv3_gfsv16_ugwpv1                                                                                                       |                                         | fv3 |
-RUN     | fv3_gfsv16_ugwpv1_warmstart                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_ras                                                                                                         |                                         | fv3 |
 
 ###################################################################################################################################################################################
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                                     |                                         | fv3 |
+COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                                                   |                                         | fv3 |
 RUN     | fv3_gfs_v16_debug                                                                                                       |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                                         | fv3 |
 
@@ -162,13 +161,16 @@ RUN     | fv3_thompson_no_aero_debug
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                                         | fv3 |
 RUN     | fv3_rrfs_v1alpha_debug                                                                                                  |                                         | fv3 |
 
-COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                           |                                         | fv3 |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                            |                                         | fv3 |
 RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                                         | fv3 |
 #RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                 |                                         | fv3 |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                                         | fv3 |
 RUN     | fv3_gfsv16_ugwpv1_debug                                                                                                 |                                         | fv3 |
 RUN     | fv3_gfs_v16_ras_debug                                                                                                   |                                         | fv3 |
 
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y DEBUG=Y                                                        |                                         | fv3 |
+RUN     | fv3_multigases_debug                                                                                                    |                                         | fv3 |
+
 ###################################################################################################################################################################################
 # NEMS Data Atmosphere tests                                                                                                                                                      #
 ###################################################################################################################################################################################

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210526
+BL_DATE=20210527
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf
@@ -36,7 +36,7 @@ RUN     | fv3_rap
 RUN     | fv3_hrrr                                                                                                          |                | fv3         |
 
 # Compile without suite argument for CAPS physics
-COMPILE | APP=ATM REPRO=Y                                                                                                   |                | fv3         |
+COMPILE | APP=ATM REPRO=Y SUITES=FV3_GFS_2017_ntiedtke,FV3_GFS_2017_shinhong,FV3_GFS_2017_ysu                               |                | fv3         |
 # Run tests
 RUN     | fv3_shinhong                                                                                                      |                | fv3         |
 RUN     | fv3_ysu                                                                                                           |                | fv3         |

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -19,14 +19,17 @@ RUN     | fv3_thompson_no_aero
 RUN     | fv3_rrfs_v1alpha                                                                                                        |                | fv3         |
 RUN     | fv3_rrfs_v1beta                                                                                                         |                | fv3         |
 
-COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                   |                | fv3         |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras                                   |                | fv3         |
 RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                | fv3         |
 #RUN     | fv3_HAFS_v0_hwrf                                                                                                        |                | fv3         |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                | fv3         |
 RUN     | fv3_gfsv16_ugwpv1                                                                                                       |                | fv3         |
-RUN     | fv3_gfsv16_ugwpv1_warmstart                                                                                             |                | fv3         |
 RUN     | fv3_gfs_v16_ras                                                                                                         |                | fv3         |
 
+# This crashes with 'NaN in input field of mpp_reproducing_sum(_2d)' after 64 time steps
+#COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                |                | fv3         |
+#RUN     | fv3_multigases                                                                                                          |                | fv3         |
+
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
 ##################################################################################################################################################################
@@ -46,16 +49,16 @@ RUN     | fv3_gfs_v15p2_debug
 RUN     | fv3_gfs_v16_debug                                                                                                       |                | fv3         |
 RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                | fv3         |
 
-COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                |                | fv3         |
-RUN     | fv3_multigases                                                                                                          |                | fv3         |
-
-COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                           |                | fv3         |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                            |                | fv3         |
 RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                | fv3         |
 #RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                  |                | fv3         |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                | fv3         |
 RUN     | fv3_gfsv16_ugwpv1_debug                                                                                                 |                | fv3         |
 RUN     | fv3_gfs_v16_ras_debug                                                                                                   |                | fv3         |
 
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y DEBUG=Y                                                        |                | fv3         |
+RUN     | fv3_multigases_debug                                                                                                    |                | fv3         |
+
 ##################################################################################################################################################################
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################

diff --git a/tests/tests/fv3_gfdlmprad_noahmp b/tests/tests/fv3_gfdlmprad_noahmp
@@ -63,7 +63,6 @@ export LHEATSTRG=.false.
 export IALB=2
 export IEMS=2
 
-
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.

diff --git a/tests/tests/fv3_gfsv16_ugwpv1 b/tests/tests/fv3_gfsv16_ugwpv1
@@ -76,12 +76,7 @@ export SHOUR=00
 DT_ATMOS="600"
 
 export FV3_RUN=gfsv16_ugwpv1_run.IN
-export CCPP_SUITE=FV3_GFS_v16b_ugwpv1
+export CCPP_SUITE=FV3_GFS_v16_ugwpv1
 export INPUT_NML=v16_c96_ugwpv1.nml.IN
 export WLCLK=30
 
-# Cold start, these are defaults
-#export WARM_START=.F.
-#export EXTERNAL_IC=.T.
-#export MOUNTAIN=.F.
-
diff --git a/tests/tests/fv3_gfsv16_ugwpv1_debug b/tests/tests/fv3_gfsv16_ugwpv1_debug
@@ -76,12 +76,6 @@ DT_ATMOS="600"
 export FHMAX=6
 
 export FV3_RUN=gfsv16_ugwpv1_run.IN
-export CCPP_SUITE=FV3_GFS_v16b_ugwpv1
+export CCPP_SUITE=FV3_GFS_v16_ugwpv1
 export INPUT_NML=v16_c96_ugwpv1.nml.IN
 export WLCLK=30
-
-# Cold start, these are defaults
-#export WARM_START=.F.
-#export EXTERNAL_IC=.T.
-#export MOUNTAIN=.F.
-
diff --git a/tests/tests/fv3_gsd b/tests/tests/fv3_gsd
@@ -107,6 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_RRTMGP b/tests/tests/fv3_gsd_RRTMGP
@@ -108,6 +108,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_RRTMGP
 export INPUT_NML=gsd_rrtmgp.nml.IN

diff --git a/tests/tests/fv3_gsd_RRTMGP_debug b/tests/tests/fv3_gsd_RRTMGP_debug
@@ -84,6 +84,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_RRTMGP
 export INPUT_NML=gsd_rrtmgp.nml.IN

diff --git a/tests/tests/fv3_gsd_coldstart b/tests/tests/fv3_gsd_coldstart
@@ -45,6 +45,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_debug b/tests/tests/fv3_gsd_debug
@@ -83,6 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_diag3d_debug b/tests/tests/fv3_gsd_diag3d_debug
@@ -83,6 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export LDIAG3D=.T.
 export QDIAG3D=.T.
 export MAX_OUTPUT_FIELDS=400

diff --git a/tests/tests/fv3_gsd_drag_suite b/tests/tests/fv3_gsd_drag_suite
@@ -83,6 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_drag_suite
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_drag_suite_unified_ugwp b/tests/tests/fv3_gsd_drag_suite_unified_ugwp
@@ -87,6 +87,9 @@ export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
 export INPUT_NML=gsd.nml.IN
 
+export IALB=2
+export IEMS=2
+
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
 export IMFSHALCNV=3

diff --git a/tests/tests/fv3_gsd_lndp b/tests/tests/fv3_gsd_lndp
@@ -80,6 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_mynnsfc b/tests/tests/fv3_gsd_mynnsfc
@@ -108,6 +108,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_mynnsfc
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_mynnsfc_debug b/tests/tests/fv3_gsd_mynnsfc_debug
@@ -84,6 +84,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_mynnsfc
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_sar b/tests/tests/fv3_gsd_sar
@@ -23,6 +23,9 @@ export LIST_FILES="dynf000.nc \
 export FHMAX=3
 export FDIAG=1
 
+export IALB=2
+export IEMS=2
+
 export_fv3
 export TASKS=24
 

diff --git a/tests/tests/fv3_gsd_sar_debug b/tests/tests/fv3_gsd_sar_debug
@@ -23,6 +23,9 @@ export LIST_FILES="dynf000.nc \
 export FHMAX=1
 export FDIAG=1
 
+export IALB=2
+export IEMS=2
+
 export_fv3
 export TASKS=24
 

diff --git a/tests/tests/fv3_gsd_unified_ugwp b/tests/tests/fv3_gsd_unified_ugwp
@@ -107,6 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
 export INPUT_NML=gsd.nml.IN

diff --git a/tests/tests/fv3_gsd_warmstart b/tests/tests/fv3_gsd_warmstart
@@ -75,6 +75,9 @@ export MOUNTAIN=.T.
 export NA_INIT=0
 export NSTF_NAME=2,0,1,0,5
 
+export IALB=2
+export IEMS=2
+
 export FHMAX=48
 export FDIAG=3
 

diff --git a/tests/tests/fv3_hrrr b/tests/tests/fv3_hrrr
@@ -83,6 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
+export IALB=2
+export IEMS=2
+
 export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=gsd.nml.IN