diff --git a/FV3 b/FV3
index 979bcab28f..da95cc428d 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 979bcab28f63b37411698cd9d23d04d0b0fe3a7e
+Subproject commit da95cc428d8b626e99250fd57a4279b4980044f8
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
index ab7bd14d20..0730606b80 160000
--- a/MOM6-interface/MOM6
+++ b/MOM6-interface/MOM6
@@ -1 +1 @@
-Subproject commit ab7bd14d209592d55490e75dbfaa61cb4a62df97
+Subproject commit 0730606b808f2979241d850e763955f5526a980c
diff --git a/build.sh b/build.sh
index a92ee521f2..c1cfe43d8d 100755
--- a/build.sh
+++ b/build.sh
@@ -26,4 +26,4 @@ for i in ${CMAKE_FLAGS}; do ARR_CMAKE_FLAGS+=("${i}") ; done
 cmake "${UFS_MODEL_DIR}" "${ARR_CMAKE_FLAGS[@]}"
 # Turn off OpenMP threading for parallel builds
 # to avoid exhausting the number of user processes
-OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-1}"
\ No newline at end of file
+OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-}"
\ No newline at end of file
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
index d230802e95..2c9c09b289 100644
--- a/tests/bl_date.conf
+++ b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20240408
+export BL_DATE=20240419
diff --git a/tests/ci/Jenkinsfile.combined b/tests/ci/Jenkinsfile.combined
index 47fb97ec73..5b3d072320 100644
--- a/tests/ci/Jenkinsfile.combined
+++ b/tests/ci/Jenkinsfile.combined
@@ -11,7 +11,6 @@ for (label in pullRequest.labels) {
    if ((label.matches(node.getLabelString()+"(.*)-BL"))) {
      generateBaselineNode += node.getLabelString() 
    }
-
  }
 }
 
@@ -60,6 +59,14 @@ def generateStage(nodeLabel) {
                             chgrp noaa-hpc develop-${BL_DATE}
 		            cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+                            cp RegressionTests_hercules.log /work/noaa/epic/role-epic/jenkins/workspace
+                            git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_hercules.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
                             echo "Creating baselines on $machine"
@@ -77,24 +84,40 @@ def generateStage(nodeLabel) {
                             chgrp noaa-hpc develop-${BL_DATE}
 			    cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             cd logs/
+                             cp RegressionTests_orion.log /work/noaa/epic/role-epic/jenkins/workspace
+                             git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_orion.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Gaea" ]]
                           then 
                             echo "Creating baselines on $machine"
                             ./rt.sh -a ${ACCNR} -c -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                             unset LD_LIBRARY_PATH
-                            export DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
+                            export DISKNM=/gpfs/f5/epic/world-shared/UFS-WM_RT
                             cd ${DISKNM}/NEMSfv3gfs/
                             mkdir develop-${BL_DATE}
-                            cd  /lustre/f2/scratch/role.epic/FV3_RT
+                            cd /gpfs/f5/epic/scratch/role.epic/FV3_RT
                             rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
                             cd ${DISKNM}/NEMSfv3gfs/
                             chgrp ncep develop-${BL_DATE}
 		            cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+			    cp RegressionTests_gaea.log /gpfs/f5/epic/scratch/role.epic/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_gaea.log $WORKSPACE/tests/logs/
+			    cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Hera" ]]
                           then
                             echo "Creating baselines on $machine"
-                            export ACCNR=nems
+                            export ACCNR=epic
                             ./rt.sh -a ${ACCNR} -c -r -l rt.conf
                             export DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
 			    cd ${DISKNM}/NEMSfv3gfs/
@@ -103,6 +126,14 @@ def generateStage(nodeLabel) {
 			    rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
 			    cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_hera.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                            elif [[ $machine =~ "Derecho" ]]
                            then
                              echo "Creating baselines on $machine"
@@ -115,6 +146,14 @@ def generateStage(nodeLabel) {
 			     rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
 			     cd $WORKSPACE/tests
                              ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_derecho.log /glade/derecho/scratch/epicufsrt/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+                             cp RegressionTests_derecho.log $WORKSPACE/tests/logs/
+                             cd $WORKSPACE/tests/
                           else
                             echo "Creating baselines on $machine"
                             ./rt.sh -a ${ACCNR} -c -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
@@ -159,32 +198,72 @@ def generateStage(nodeLabel) {
                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                           elif [[ $machine =~ "Hercules" ]]
                           then
-                           echo "Running regression tests on $machine"
+                          echo "Running regression tests on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             export ACCNR=epic
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                            cd logs/
+                            cp RegressionTests_hercules.log /work/noaa/epic/role-epic/jenkins/workspace
+                            git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+                            cp RegressionTests_hercules.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
                            echo "Running regression tests on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             cd logs/
+                             cp RegressionTests_orion.log /work/noaa/epic/role-epic/jenkins/workspace
+                             git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_orion.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Gaea" ]]
                           then 
                            echo "Running regression tests on $machine"
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                             unset LD_LIBRARY_PATH
+			    cd logs/
+			    cp RegressionTests_gaea.log /gpfs/f5/epic/scratch/role.epic/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_gaea.log $WORKSPACE/tests/logs/
+			    cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Hera" ]]
                           then
                            echo "Running regression tests on $machine"
-                           export ACCNR=nems
-                          ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             export ACCNR=epic
+                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_hera.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
 			  elif [[ $machine =~ "Derecho" ]]
                           then
                            echo "Running regression tests on $machine"
                            export ACCNR=nral0032
                            ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+			    cp RegressionTests_derecho.log /glade/derecho/scratch/epicufsrt/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+                            cp RegressionTests_derecho.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           else
                            echo "Running regression tests on $machine"
                            ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
old mode 100755
new mode 100644
index 7bbbd3652f..03e70f9308
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -420,341 +420,473 @@ export CMP_DATAONLY=false
 export esmf_logkind="ESMF_LOGKIND_MULTI"
 export DumpFields="false"
 
-export_fv3 ()
+export_fv3_v16 ()
 {
-# ufs.configure defaults
-  export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
-  export MODEL_CONFIGURE=model_configure.IN
-  export atm_model=fv3
+# Add support for v16 test cases. This section
+# will be removed once support for GFSv16 is
+# officially depricated.
 
-  export FV3=true
-  export S2S=false
-  export HAFS=false
-  export AQM=false
-  export DATM_CDEPS=false
-  export DOCN_CDEPS=false
-  export CDEPS_INLINE=false
-  export POSTAPP='global'
-  export USE_MERRA2=.false.
+# Load in FV3 values
+export_fv3
 
-  export NTILES=6
-  export INPES=${INPES_dflt}
-  export JNPES=${JNPES_dflt}
-  export RESTART_INTERVAL=0
-  export QUILTING=.true.
-  export QUILTING_RESTART=.true.
-  export WRITE_GROUP=1
-  export WRTTASK_PER_GROUP=6
-  export ITASKS=1
-  export OUTPUT_HISTORY=.true.
-  export HISTORY_FILE_ON_NATIVE_GRID=.false.
-  export WRITE_DOPOST=.false.
-  export NUM_FILES=2
-  export FILENAME_BASE="'atm' 'sfc'"
-  export OUTPUT_GRID="'cubed_sphere_grid'"
-  export OUTPUT_FILE="'netcdf'"
-  export ZSTANDARD_LEVEL=0
-  export IDEFLATE=0
-  export QUANTIZE_NSD=0
-  export ICHUNK2D=0
-  export JCHUNK2D=0
-  export ICHUNK3D=0
-  export JCHUNK3D=0
-  export KCHUNK3D=0
-  export IMO=384
-  export JMO=190
-  export WRITE_NSFLIP=.false.
-
-  #input file
-  export DIAG_TABLE=diag_table_gfsv16
-  export FIELD_TABLE=field_table_gfsv16
-
-  export DOMAINS_STACK_SIZE=3000000
-
-  # Coldstart/warmstart
-  #rt script for ICs
-  export MODEL_INITIALIZATION=false
-  #namelist variable
-  export WARM_START=.false.
-  export READ_INCREMENT=.false.
-  export RES_LATLON_DYNAMICS="''"
-  export NGGPS_IC=.true.
-  export EXTERNAL_IC=.true.
-  export MAKE_NH=.true.
-  export MOUNTAIN=.false.
-  export NA_INIT=1
-
-  # Radiation
-  export DO_RRTMGP=.false.
-  export DOGP_CLDOPTICS_LUT=.false.
-  export DOGP_LWSCAT=.false.
-  export USE_LW_JACOBIAN=.false.
-  export DAMP_LW_FLUXADJ=.false.
-  export RRTMGP_LW_PHYS_BLKSZ=2
-  export ICLOUD=0
-  export IAER=111
-  export ICLIQ_SW=1
-  export IOVR=1
-  export LFNC_K=-999
-  export LFNC_P0=-999
-
-  # Microphysics
-  export IMP_PHYSICS=11
-  export NWAT=6
-  # GFDL MP
-  export DNATS=1
-  export DO_SAT_ADJ=.true.
-  export LHEATSTRG=.true.
-  export LSEASPRAY=.false.
-  export LGFDLMPRAD=.false.
-  export EFFR_IN=.false.
-  # Thompson MP
-  export LRADAR=.true.
-  export LTAEROSOL=.true.
-  export EXT_DIAG_THOMPSON=.false.
-  export SEDI_SEMI=.true.
-  export DECFL=10
-  # NSSL MP
-  export NSSL_CCCN=0.6e9
-  export NSSL_ALPHAH=0.0
-  export NSSL_ALPHAHL=1.0
-  export NSSL_HAIL_ON=.false.
-  export NSSL_CCN_ON=.true.
-  export NSSL_INVERTCCN=.true.
-
-  # Smoke
-  export RRFS_SMOKE=.false.
-  export SMOKE_FORECAST=0
-  export RRFS_RESTART=NO
-  export SEAS_OPT=2
-
-  # GWD
-  export LDIAG_UGWP=.false.
-  export DO_UGWP=.false.
-  export DO_TOFD=.false.
-  export GWD_OPT=1
-  export DO_UGWP_V0=.false.
-  export DO_UGWP_V1_W_GSLDRAG=.false.
-  export DO_UGWP_V0_OROG_ONLY=.false.
-  export DO_GSL_DRAG_LS_BL=.false.
-  export DO_GSL_DRAG_SS=.false.
-  export DO_GSL_DRAG_TOFD=.false.
-  export DO_UGWP_V1=.false.
-  export DO_UGWP_V1_OROG_ONLY=.false.
-  export KNOB_UGWP_DOKDIS=1
-  export KNOB_UGWP_NDX4LH=1
-  export KNOB_UGWP_VERSION=0
-  export KNOB_UGWP_PALAUNCH=500.e2
-  export KNOB_UGWP_NSLOPE=1
-
-  # resolution dependent settings
-  export CDMBWD_c48='0.071,2.1,1.0,1.0'
-  export CDMBWD_c96='0.14,1.8,1.0,1.0'
-  export CDMBWD_c192='0.23,1.5,1.0,1.0'
-  export CDMBWD_c384='1.1,0.72,1.0,1.0'
-  export CDMBWD_c768='4.0,0.15,1.0,1.0'
-
-  #DT_INNER=(Time step)/2
-  export DT_INNER_c96=360
-  export DT_INNER_c192=300
-  export DT_INNER_c384=150
-  export DT_INNER_c768=75
-
-  # set default
-  export CDMBWD=${CDMBWD_c96}
-  export DT_INNER=${DT_INNER_c96}
-
-  # PBL
-  export SATMEDMF=.false.
-  export ISATMEDMF=0
-  export HYBEDMF=.true.
-  export SHINHONG=.false.
-  export DO_YSU=.false.
-  export DO_MYNNEDMF=.false.
-  export HURR_PBL=.false.
-  export MONINQ_FAC=1.0
-  export SFCLAY_COMPUTE_FLUX=.false.
-
-  # Shallow/deep convection
-  export DO_DEEP=.true.
-  export SHAL_CNV=.true.
-  export IMFSHALCNV=2
-  export HWRF_SAMFSHAL=.false.
-  export IMFDEEPCNV=2
-  export HWRF_SAMFDEEP=.false.
-  export RAS=.false.
-  export RANDOM_CLDS=.false.
-  export CNVCLD=.true.
-  export PROGSIGMA=.false.
-  export BETASCU=8.0
-  export BETAMCU=1.0
-  export BETADCU=2.0
-
-  # Aerosol convective scavenging
-  export FSCAV_AERO='"*:0.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc1:0.6","bc2:0.6","oc1:0.4","oc2:0.4","dust1:0.6","dust2:0.6","dust3:0.6","dust4:0.6","dust5:0.6","seas1:0.5","seas2:0.5","seas3:0.5","seas4:0.5","seas5:0.5"'
-
-  # SFC
-  export DO_MYJSFC=.false.
-  export DO_MYNNSFCLAY=.false.
-  export BL_MYNN_TKEADVECT=.false.
-
-  # LSM
-  export LSM=1
-  export LSOIL_LSM=4
-  export LANDICE=.true.
-  export KICE=2
-  export IALB=1
-  export IEMS=1
-
-  # Ozone / stratospheric H2O
-  export OZ_PHYS_OLD=.true.
-  export OZ_PHYS_NEW=.false.
-  export H2O_PHYS=.false.
-
-  # Lake models
-  export LKM=0 # 0=no lake, 1=run lake model, 2=run both lake and nsst on lake points
-  export IOPT_LAKE=2 # 1=flake, 2=clm lake
-  export LAKEFRAC_THRESHOLD=0.0 # lake fraction must be higher for lake model to run it
-  export LAKEDEPTH_THRESHOLD=1.0 # lake must be deeper (in meters) for a lake model to run it
-  export FRAC_ICE=.true. # should be false for flake, true for clm_lake
-
-  export CPL=.false.
-  export CPLCHM=.false.
-  export CPLFLX=.false.
-  export CPLICE=.false.
-  export CPLWAV=.false.
-  export CPLWAV2ATM=.false.
-  export CPLLND=.false.
-  export CPLLND2ATM=.false.
-  export USE_MED_FLUX=.false.
-  export DAYS=1
-  export NPX=97
-  export NPY=97
-  export NPZ=64
-  export NPZP=65
-  export NSTF_NAME=2,1,1,0,5
-  export OUTPUT_FH="12 -1"
-  export FHZERO=6
-  export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
-  export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb'"
-  export FNSOTC="'global_soiltype.statsgo.t126.384.190.rg.grb'"
-  export FNSOCC="''"
-  export FNSMCC="'global_soilmgldas.t126.384.190.grb'"
-  export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
-  export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
-  export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
-
-  # Dynamical core
-  export FV_CORE_TAU=0.
-  export RF_CUTOFF=30.0
-  export FAST_TAU_W_SEC=0.0
-
-  # Tiled Fix files
-  export ATMRES=C96
-  export TILEDFIX=.false.
+# Replace FV3 variable with old values as needed
+export USE_MERRA2=.false.
+export WRITE_NSFLIP=.false.
+
+export DIAG_TABLE=diag_table_gfsv16
+export FIELD_TABLE=field_table_gfsv16
+export FV3_RUN=control_run.IN
+export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v16
+
+export DOGP_CLDOPTICS_LUT=.false.
+export DOGP_LWSCAT=.false.
+export IAER=111
+export ICLIQ_SW=1
+export IOVR=1
+export IMP_PHYSICS=11
+export DNATS=1
+export DO_SAT_ADJ=.true.
+export LHEATSTRG=.true.
+export LSEASPRAY=.false.
+export GWD_OPT=1
+export DO_UGWP_V0=.false.
+export DO_GSL_DRAG_SS=.false.
+export SATMEDMF=.false.
+export ISATMEDMF=0
+
+export LSM=1
+export LANDICE=.true.
+export IALB=1
+export IEMS=1
+
+export NSTF_NAME=2,1,1,0,5
+export FNALBC="'global_snowfree_albedo.bosu.t126.384.190.rg.grb'"
+export FNVETC="'global_vegtype.igbp.t126.384.190.rg.grb'"
+export FNSOTC="'global_soiltype.statsgo.t126.384.190.rg.grb'"
+export FNSOCC="''"
+export FNSMCC="'global_soilmgldas.t126.384.190.grb'"
+export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
+export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
+export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
+
+export RF_CUTOFF=30.0
+export FAST_TAU_W_SEC=0.0
+
+export ATMRES=C96
+export TILEDFIX=.false.
+export DO_CA=.false.
+export CA_SGS=.false.
 
-  export ENS_NUM=1
-  export SYEAR=2016
-  export SMONTH=10
-  export SDAY=03
-  export SHOUR=00
-  export SECS=$(( SHOUR*600 ))
-  export FHMAX=$(( DAYS*24 ))
-  export DT_ATMOS=1800
-  export FHCYC=24
-  export FHROT=0
-  export LDIAG3D=.false.
-  export QDIAG3D=.false.
-  export PRINT_DIFF_PGR=.false.
-  export MAX_OUTPUT_FIELDS=310
-
-  # Stochastic physics
-  export STOCHINI=.false.
-  export DO_SPPT=.false.
-  export DO_SHUM=.false.
-  export DO_SKEB=.false.
-  export LNDP_TYPE=0
-  export N_VAR_LNDP=0
-  export SKEB=-999.
-  export SPPT=-999.
-  export SHUM=-999.
-  export LNDP_VAR_LIST="'XXX'"
-  export LNDP_PRT_LIST=-999
-  export LNDP_MODEL_TYPE=0
-
-  #IAU
-  export IAU_INC_FILES="''"
-  export IAU_DELTHRS=0
-  export IAUFHRS=-1
-  export IAU_OFFSET=0
-
-  export FH_DFI_RADAR='-2e10'
-
-  #Cellular automata
-  export DO_CA=.false.
-  export CA_SGS=.false.
-  export CA_GLOBAL=.false.
-
-  #waves
-  export WW3_RSTDTHR=12
-  WW3_DT_2_RST="$(printf "%02d" $(( WW3_RSTDTHR*3600 )))"
-  export WW3_DT_2_RST
-  export WW3_OUTDTHR=1
-  WW3_DTFLD="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
-  export WW3_DTFLD
-  WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
-  export WW3_DTPNT
-  export DTRST=0
-  export RSTTYPE=T
-  export GOFILETYPE=1
-  export POFILETYPE=1
-  export WW3_OUTPARS="WND HS FP DP PHS PTP PDIR"
-  export CPLILINE='$'
-  export ICELINE='$'
-  export WINDLINE='$'
-  export CURRLINE='$'
-  export NFGRIDS=0
-  export NMGRIDS=1
-  export WW3GRIDLINE="'glo_1deg'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
-  export FUNIPNT=T
-  export IOSRV=1
-  export FPNTPROC=T
-  export FGRDPROC=T
-  export UNIPOINTS='points'
-  export FLAGMASKCOMP=' F'
-  export FLAGMASKOUT=' F'
-  RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR  )))0000"
-  export RUN_BEG
-  RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR  )))0000"
-  export RUN_END
-  export OUT_BEG=${RUN_BEG}
-  export OUT_END=${RUN_END}
-  export RST_BEG=${RUN_BEG}
-  export RST_2_BEG=${RUN_BEG}
-  export RST_END=${RUN_END}
-  export RST_2_END=${RUN_END}
-  export WW3_CUR='F'
-  export WW3_ICE='F'
-  export WW3_IC1='F'
-  export WW3_IC5='F'
-  # ATMW
-  export WW3_MULTIGRID=true
-  export WW3_MODDEF=mod_def.glo_1deg
-  export MESH_WAV=mesh.glo_1deg.nc
+}
 
-  # ATMA
-  export AOD_FRQ=060000
 
-  # Regional
-  export WRITE_RESTART_WITH_BCS=.false.
+export_fv3 ()
+{
+if [[ -z ${ATMRES+x} || -z ${ATMRES} ]]; then
+    export ATMRES=C96
+fi
 
-  # Diagnostics
-  export PRINT_DIFF_PGR=.false.
+# ufs.configure defaults
+export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
+export MODEL_CONFIGURE=model_configure.IN
+export atm_model=fv3
+
+export FV3=true
+export S2S=false
+export HAFS=false
+export AQM=false
+export DATM_CDEPS=false
+export DOCN_CDEPS=false
+export CDEPS_INLINE=false
+export POSTAPP='global'
+export USE_MERRA2=.true.
+
+export NTILES=6
+export INPES=${INPES_dflt}
+export JNPES=${JNPES_dflt}
+export RESTART_INTERVAL=0
+export QUILTING=.true.
+export QUILTING_RESTART=.true.
+export WRITE_GROUP=1
+export WRTTASK_PER_GROUP=6
+export ITASKS=1
+export OUTPUT_HISTORY=.true.
+export HISTORY_FILE_ON_NATIVE_GRID=.false.
+export WRITE_DOPOST=.false.
+export NUM_FILES=2
+export FILENAME_BASE="'atm' 'sfc'"
+export OUTPUT_GRID="'cubed_sphere_grid'"
+export OUTPUT_FILE="'netcdf'"
+export ZSTANDARD_LEVEL=0
+export IDEFLATE=0
+export QUANTIZE_NSD=0
+export ICHUNK2D=0
+export JCHUNK2D=0
+export ICHUNK3D=0
+export JCHUNK3D=0
+export KCHUNK3D=0
+export IMO=384
+export JMO=190
+export WRITE_NSFLIP=.true.
+
+export DZ_MIN=6
+export MIN_SEAICE=0.15
+export FRAC_GRID=.true.
+export MIN_LAKEICE=0.15
+
+#input file
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export FIELD_TABLE=field_table_thompson_noaero_tke
+export DIAG_TABLE=diag_table_cpld.IN
+export INPUT_NML=global_control.nml.IN
+
+export DOMAINS_STACK_SIZE=3000000
+
+# Coldstart/warmstart
+#rt script for ICs
+export MODEL_INITIALIZATION=false
+#namelist variable
+export WARM_START=.false.
+export READ_INCREMENT=.false.
+export RES_LATLON_DYNAMICS="''"
+export NGGPS_IC=.true.
+export EXTERNAL_IC=.true.
+export MAKE_NH=.true.
+export MOUNTAIN=.false.
+export NA_INIT=1
+
+# Radiation
+export DO_RRTMGP=.false.
+export DOGP_CLDOPTICS_LUT=.true.
+export DOGP_LWSCAT=.true.
+export DOGP_SGS_CNV=.true.
+export USE_LW_JACOBIAN=.false.
+export DAMP_LW_FLUXADJ=.false.
+export RRTMGP_LW_PHYS_BLKSZ=2
+export ICLOUD=0
+export IAER=1011
+export ICLIQ_SW=2
+export IOVR=3
+export LFNC_K=-999
+export LFNC_P0=-999
+
+# Microphysics
+export IMP_PHYSICS=8
+export NWAT=6
+# GFDL MP
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LHEATSTRG=.false.
+export LSEASPRAY=.true.
+export LGFDLMPRAD=.false.
+export EFFR_IN=.false.
+# Thompson MP
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export EXT_DIAG_THOMPSON=.false.
+export SEDI_SEMI=.true.
+export DECFL=10
+# NSSL MP
+export NSSL_CCCN=0.6e9
+export NSSL_ALPHAH=0.0
+export NSSL_ALPHAHL=1.0
+export NSSL_HAIL_ON=.false.
+export NSSL_CCN_ON=.true.
+export NSSL_INVERTCCN=.true.
+
+# Smoke
+export RRFS_SMOKE=.false.
+export SMOKE_FORECAST=0
+export RRFS_RESTART=NO
+export SEAS_OPT=2
+
+# GWD
+export LDIAG_UGWP=.false.
+export DO_UGWP=.false.
+export DO_TOFD=.false.
+export GWD_OPT=2
+export DO_UGWP_V0=.true.
+export DO_UGWP_V1_W_GSLDRAG=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.false.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.false.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export KNOB_UGWP_DOKDIS=1
+export KNOB_UGWP_NDX4LH=1
+export KNOB_UGWP_VERSION=0
+export KNOB_UGWP_PALAUNCH=500.e2
+export KNOB_UGWP_NSLOPE=1
+export DO_UGWP_V0_NST_ONLY=.false.
+
+# resolution dependent settings
+export CDMBWD_c48='0.071,2.1,1.0,1.0'
+export CDMBWD_c96='0.14,1.8,1.0,1.0'
+export CDMBWD_c192='0.23,1.5,1.0,1.0'
+export CDMBWD_c384='1.1,0.72,1.0,1.0'
+export CDMBWD_c768='4.0,0.15,1.0,1.0'
+
+#DT_INNER=(Time step)/2
+export DT_INNER_c96=360
+export DT_INNER_c192=300
+export DT_INNER_c384=150
+export DT_INNER_c768=75
+
+# set default
+export CDMBWD=${CDMBWD_c96}
+export DT_INNER=${DT_INNER_c96}
+
+# PBL
+export SATMEDMF=.true.
+export HYBEDMF=.true.
+export SHINHONG=.false.
+export DO_YSU=.false.
+export DO_MYNNEDMF=.false.
+export HURR_PBL=.false.
+export MONINQ_FAC=1.0
+export SFCLAY_COMPUTE_FLUX=.false.
+
+# Shallow/deep convection
+export DO_DEEP=.true.
+export SHAL_CNV=.true.
+export IMFSHALCNV=2
+export HWRF_SAMFSHAL=.false.
+export IMFDEEPCNV=2
+export HWRF_SAMFDEEP=.false.
+export RAS=.false.
+export RANDOM_CLDS=.false.
+export CNVCLD=.true.
+export PROGSIGMA=.false.
+export BETASCU=8.0
+export BETAMCU=1.0
+export BETADCU=2.0
+
+# Aerosol convective scavenging
+export FSCAV_AERO='"*:0.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc1:0.6","bc2:0.6","oc1:0.4","oc2:0.4","dust1:0.6","dust2:0.6","dust3:0.6","dust4:0.6","dust5:0.6","seas1:0.5","seas2:0.5","seas3:0.5","seas4:0.5","seas5:0.5"'
+
+# SFC
+export DO_MYJSFC=.false.
+export DO_MYNNSFCLAY=.false.
+export BL_MYNN_TKEADVECT=.false.
+
+# LSM
+export LSM=2
+export LSOIL_LSM=4
+export LANDICE=.false.
+export KICE=2
+export IALB=2
+export IEMS=2
+export IOPT_DVEG=4
+export IOPT_CRS=2
+export IOPT_RAD=3
+export IOPT_ALB=1
+export IOPT_STC=3
+
+export IOPT_SFC=3
+export IOPT_TRS=2
+export IOPT_DIAG=2
+
+export D2_BG_K1=0.20
+export D2_BG_K2=0.04
+export PSM_BC=1
+
+export DDDMP=0.1
+
+# Ozone / stratospheric H2O
+export OZ_PHYS_OLD=.true.
+export OZ_PHYS_NEW=.false.
+export H2O_PHYS=.false.
+
+# Lake models
+export LKM=0 # 0=no lake, 1=run lake model, 2=run both lake and nsst on lake points
+export IOPT_LAKE=2 # 1=flake, 2=clm lake
+export LAKEFRAC_THRESHOLD=0.0 # lake fraction must be higher for lake model to run it
+export LAKEDEPTH_THRESHOLD=1.0 # lake must be deeper (in meters) for a lake model to run it
+export FRAC_ICE=.true. # should be false for flake, true for clm_lake
+
+# Tiled Fix files
+export TILEDFIX=.true.
+
+export CPL=.false.
+export CPLCHM=.false.
+export CPLFLX=.false.
+export CPLICE=.false.
+export CPLWAV=.false.
+export CPLWAV2ATM=.false.
+export CPLLND=.false.
+export CPLLND2ATM=.false.
+export USE_MED_FLUX=.false.
+export DAYS=1
+export NPX=97
+export NPY=97
+export NPZ=64
+export NPZP=65
+export NSTF_NAME=2,1,0,0,0
+export OUTPUT_FH="12 -1"
+export FHZERO=6
+export FSICL=0
+export FSICS=0
+
+# Dynamical core
+export FV_CORE_TAU=0.
+export RF_CUTOFF=10.0
+export FAST_TAU_W_SEC=0.2
+export DRY_MASS=98320.0
+
+export ENS_NUM=1
+export SYEAR=2016
+export SMONTH=10
+export SDAY=03
+export SHOUR=00
+export SECS=$(( SHOUR*3600 ))
+export FHMAX=$(( DAYS*24 ))
+export DT_ATMOS=1800
+export FHCYC=24
+export FHROT=0
+export LDIAG3D=.false.
+export QDIAG3D=.false.
+export PRINT_DIFF_PGR=.false.
+export MAX_OUTPUT_FIELDS=310
+
+# Stochastic physics
+export STOCHINI=.false.
+export DO_SPPT=.false.
+export DO_SHUM=.false.
+export DO_SKEB=.false.
+export LNDP_TYPE=0
+export N_VAR_LNDP=0
+export SKEB=-999.
+export SPPT=-999.
+export SHUM=-999.
+export LNDP_VAR_LIST="'XXX'"
+export LNDP_PRT_LIST=-999
+export LNDP_MODEL_TYPE=0
+export LNDP_TAU=21600,
+export LNDP_LSCALE=500000,
+export ISEED_LNDP=2010,
+
+#IAU
+export IAU_INC_FILES="''"
+export IAU_DELTHRS=0
+export IAUFHRS=-1
+export IAU_OFFSET=0
+
+export FH_DFI_RADAR='-2e10'
+
+#Cellular automata
+export DO_CA=.true.
+export CA_SGS=.true.
+export CA_GLOBAL=.false.
+export NCA=1
+export NCELLS=5
+export NLIVES=12
+export NTHRESH=18
+export NSEED=1
+export NFRACSEED=0.5
+export CA_TRIGGER=.true.
+export NSPINUP=1
+export ISEED_CA=12345
+
+#waves
+export WW3_RSTDTHR=12
+WW3_DT_2_RST="$(printf "%02d" $(( WW3_RSTDTHR*3600 )))"
+export WW3_DT_2_RST
+export WW3_OUTDTHR=1
+WW3_DTFLD="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+export WW3_DTFLD
+WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+export WW3_DTPNT
+export DTRST=0
+export RSTTYPE=T
+export GOFILETYPE=1
+export POFILETYPE=1
+export WW3_OUTPARS="WND HS FP DP PHS PTP PDIR"
+export CPLILINE='$'
+export ICELINE='$'
+export WINDLINE='$'
+export CURRLINE='$'
+export NFGRIDS=0
+export NMGRIDS=1
+export WW3GRIDLINE="'glo_1deg'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export FUNIPNT=T
+export IOSRV=1
+export FPNTPROC=T
+export FGRDPROC=T
+export UNIPOINTS='points'
+export FLAGMASKCOMP=' F'
+export FLAGMASKOUT=' F'
+RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR  )))0000"
+export RUN_BEG
+RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR  )))0000"
+export RUN_END
+export OUT_BEG=${RUN_BEG}
+export OUT_END=${RUN_END}
+export RST_BEG=${RUN_BEG}
+export RST_2_BEG=${RUN_BEG}
+export RST_END=${RUN_END}
+export RST_2_END=${RUN_END}
+export WW3_CUR='F'
+export WW3_ICE='F'
+export WW3_IC1='F'
+export WW3_IC5='F'
+# ATMW
+export WW3_MULTIGRID=true
+export WW3_MODDEF=mod_def.glo_1deg
+export MESH_WAV=mesh.glo_1deg.nc
+
+# ATMA
+export AOD_FRQ=060000
+
+# Regional
+export WRITE_RESTART_WITH_BCS=.false.
+
+# Diagnostics
+export PRINT_DIFF_PGR=.false.
+
+# Coupling
+export coupling_interval_fast_sec=0
+export CHOUR=06
+export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
+export MOM6_RESTART_DIR=./RESTART/
+export MOM6_RESTART_SETTING=n
+
+# Following not used for standalone
+export USE_CICE_ALB=.false.
+
+# GFDL Cloud Microphysics
+export FTSFS=90
+
+
+# NAM sfc
+export FNGLAC="'global_glacier.2x2.grb'"
+export FNMXIC="'global_maxice.2x2.grb'"
+export FNTSFC="'RTGSST.1982.2012.monthly.clim.grb'"
+export FNSNOC="'global_snoclim.1.875.grb'"
+export FNZORC="'igbp'"
+export FNAISC="'IMS-NIC.blended.ice.monthly.clim.grb'"
+}
 
-  # Coupling
-  export coupling_interval_fast_sec=0
-  export CHOUR=06
-  export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
+# Add section for tiled grid namelist
+export_tiled() {
+export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
+export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
+export FNALBC="'${ATMRES}.snowfree_albedo.tileX.nc'"
+export FNALBC2="'${ATMRES}.facsf.tileX.nc'"
+export FNTG3C="'${ATMRES}.substrate_temperature.tileX.nc'"
+export FNVEGC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+export FNVETC="'${ATMRES}.vegetation_type.tileX.nc'"
+export FNSOTC="'${ATMRES}.soil_type.tileX.nc'"
+export FNSOCC="'${ATMRES}.soil_color.tileX.nc'"
+export FNSMCC=${FNSMCC_control}
+export FNMSKH=${FNMSKH_control}
+export FNVMNC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
+export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
+export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
+export LANDICE=".false."
 }
 
 # Defaults for the CICE6 model namelist, mx100
@@ -914,195 +1046,178 @@ export_cmeps() {
 
 export_cpl ()
 {
-  export FV3=true
-  export S2S=true
-  export HAFS=false
-  export AQM=false
-  export DATM_CDEPS=false
-  export DOCN_CDEPS=false
-  export CDEPS_INLINE=false
-  export FV3BMIC='p8c'
-  export BMIC=.false.
-  export DAYS=1
-
-  #model configure
-  export MODEL_CONFIGURE=model_configure.IN
-  export SYEAR=2021
-  export SMONTH=03
-  export SDAY=22
-  export SHOUR=06
-  export CHOUR=06
-  export FHMAX=24
-  export FHROT=0
-  export DT_ATMOS=720
-  export QUILTING_RESTART=.false.
-  export WRTTASK_PER_GROUP=${WPG_cpl_dflt}
-  export WRITE_NSFLIP=.true.
-  export OUTPUT_FH='6 -1'
-
-  # default atm/ocn/ice resolution
-  export ATMRES=C96
-  export OCNRES=100
-  export ICERES=1.00
-  export NX_GLB=360
-  export NY_GLB=320
-  export NPZ=127
-  export NPZP=128
-
-  # default resources
-  export DOMAINS_STACK_SIZE=8000000
-  export INPES=${INPES_cpl_dflt}
-  export JNPES=${JNPES_cpl_dflt}
-  export THRD=${THRD_cpl_dflt}
-  export OCN_tasks=${OCN_tasks_cpl_dflt}
-  export ICE_tasks=${ICE_tasks_cpl_dflt}
-  export WAV_tasks=${WAV_tasks_cpl_dflt}
-
-  # Set CICE6 component defaults
-  export_cice6
-
-  # Set MOM6 component defaults
-  export_mom6
-
-  # Set WW3 component defaults
-  export_ww3
-
-  # Set CMEPS component defauls
-  export_cmeps
-
-  # FV3 defaults
-  export FRAC_GRID=.true.
-  export CCPP_SUITE=FV3_GFS_v17_coupled_p8
-  export INPUT_NML=cpld_control.nml.IN
-  export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-  export DIAG_TABLE=diag_table_cpld.IN
-  export DIAG_TABLE_ADDITIONAL=''
-
-  export FHZERO=6
-  export DT_INNER=${DT_ATMOS}
-
-  # P7 default
-  export IALB=2
-  export IEMS=2
-  export LSM=2
-  export IOPT_DVEG=4
-  export IOPT_CRS=2
-  export IOPT_RAD=3
-  export IOPT_ALB=1
-  export IOPT_STC=3
-  # P8
-  export IOPT_SFC=3
-  export IOPT_TRS=2
-  export IOPT_DIAG=2
-
-  # FV3 P7 settings
-  export D2_BG_K1=0.20
-  export D2_BG_K2=0.04
-  #export DZ_MIN=2
-  export PSM_BC=1
-  export DDDMP=0.1
-
-  #P8
-  export DZ_MIN=6
-
-  # P7 Merra2 Aerosols & NSST
-  export USE_MERRA2=.true.
-  export IAER=1011
-  export NSTF_NAME=2,0,0,0,0
-
-  export LHEATSTRG=.false.
-  export LSEASPRAY=.true.
-
-  # P7 UGWP1
-  export GWD_OPT=2
-  export KNOB_UGWP_NSLOPE=1
-  export DO_GSL_DRAG_LS_BL=.true.
-  export DO_GSL_DRAG_SS=.true.
-  export DO_UGWP_V1_OROG_ONLY=.false.
-  export DO_UGWP_V0_NST_ONLY=.false.
-  export LDIAG_UGWP=.false.
-  #P8
-  export DO_GSL_DRAG_TOFD=.false.
-  export CDMBWD=${CDMBWD_c96}
-
-  # P8 RRTMGP
-  export DO_RRTMGP=.false.
-  export DOGP_CLDOPTICS_LUT=.true.
-  export DOGP_LWSCAT=.true.
-  export DOGP_SGS_CNV=.true.
-
-  #P8 UGWD
-  export DO_UGWP_V0=.true.
-  export DO_UGWP_V1=.false.
-  export DO_GSL_DRAG_LS_BL=.false.
-  export KNOB_UGWP_VERSION=0
-
-  # P7 CA
-  export DO_CA=.true.
-  export CA_SGS=.true.
-  export CA_GLOBAL=.false.
-  export NCA=1
-  export NCELLS=5
-  export NLIVES=12
-  export NTHRESH=18
-  export NSEED=1
-  export NFRACSEED=0.5
-  export CA_TRIGGER=.true.
-  export NSPINUP=1
-  export ISEED_CA=12345
-
-  # P7 settings
-  export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-  export FNALBC2="'C96.facsf.tileX.nc'"
-  export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-  export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-  export FNVETC="'C96.vegetation_type.tileX.nc'"
-  export FNSOTC="'C96.soil_type.tileX.nc'"
-  export FNSOCC="'C96.soil_color.tileX.nc'"
-  export FNSMCC=${FNSMCC_control}
-  export FNMSKH=${FNMSKH_control}
-  export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-  export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-  export FNSLPC="'C96.slope_type.tileX.nc'"
-  export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-  export LANDICE=".false."
-  #P8
-  export FSICL=0
-  export FSICS=0
-
-  # P8
-  export USE_CICE_ALB=.true.
-  export MIN_SEAICE=1.0e-6
-  export DNATS=2
-  export IMP_PHYSICS=8
-  export LGFDLMPRAD=.false.
-  export DO_SAT_ADJ=.false.
-  export SATMEDMF=.true.
-
-  # P7 default
-  export CPLFLX=.true.
-  export CPLICE=.true.
-  export CPL=.true.
-  export CPLWAV=.true.
-  export CPLWAV2ATM=.true.
-  export USE_MED_FLUX=.false.
-  export CPLCHM=.true.
-  export CPLLND=.false.
-
-  # for FV3: default values will be changed if doing a warm-warm restart
-  export WARM_START=.false.
-  export MAKE_NH=.true.
-  export NA_INIT=1
-  export EXTERNAL_IC=.true.
-  export NGGPS_IC=.true.
-  export MOUNTAIN=.false.
-  # gocart inst_aod output; uses AERO_HIST.rc.IN from parm/gocart directory
-  export AOD_FRQ=060000
-
-  # checkpoint restarts
-  export RESTART_FILE_PREFIX=''
-  export RESTART_FILE_SUFFIX_SECS=''
-  export RT35D=''
+export FV3=true
+export S2S=true
+export HAFS=false
+export AQM=false
+export DATM_CDEPS=false
+export DOCN_CDEPS=false
+export CDEPS_INLINE=false
+export FV3BMIC='p8c'
+export BMIC=.false.
+export DAYS=1
+
+#model configure
+export MODEL_CONFIGURE=model_configure.IN
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export CHOUR=06
+export FHMAX=24
+export FHROT=0
+export DT_ATMOS=720
+export QUILTING_RESTART=.false.
+export WRTTASK_PER_GROUP=${WPG_cpl_dflt}
+export WRITE_NSFLIP=.true.
+export OUTPUT_FH='6 -1'
+
+# default atm/ocn/ice resolution
+export ATMRES=C96
+export OCNRES=100
+export ICERES=1.00
+export NX_GLB=360
+export NY_GLB=320
+export NPZ=127
+export NPZP=128
+
+# default resources
+export DOMAINS_STACK_SIZE=8000000
+export INPES=${INPES_cpl_dflt}
+export JNPES=${JNPES_cpl_dflt}
+export THRD=${THRD_cpl_dflt}
+export OCN_tasks=${OCN_tasks_cpl_dflt}
+export ICE_tasks=${ICE_tasks_cpl_dflt}
+export WAV_tasks=${WAV_tasks_cpl_dflt}
+
+# Set tiled file defaults
+export_tiled
+
+# Set CICE6 component defaults
+export_cice6
+
+# Set MOM6 component defaults
+export_mom6
+
+# Set WW3 component defaults
+export_ww3
+
+# Set CMEPS component defauls
+export_cmeps
+
+# FV3 defaults
+export FRAC_GRID=.true.
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8
+export INPUT_NML=global_control.nml.IN
+export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+export DIAG_TABLE=diag_table_cpld.IN
+export DIAG_TABLE_ADDITIONAL=''
+export FV3_RUN=cpld_control_run.IN
+export TILEDFIX=.false.
+
+export FHZERO=6
+export DT_INNER=${DT_ATMOS}
+
+export IALB=2
+export IEMS=2
+export LSM=2
+export IOPT_DVEG=4
+export IOPT_CRS=2
+export IOPT_RAD=3
+export IOPT_ALB=1
+export IOPT_STC=3
+
+export IOPT_SFC=3
+export IOPT_TRS=2
+export IOPT_DIAG=2
+
+export D2_BG_K1=0.20
+export D2_BG_K2=0.04
+export PSM_BC=1
+export DDDMP=0.1
+
+export DZ_MIN=6
+
+# Merra2 Aerosols & NSST
+export USE_MERRA2=.true.
+export IAER=1011
+export NSTF_NAME=2,0,0,0,0
+
+export LHEATSTRG=.false.
+export LSEASPRAY=.true.
+
+# UGWP1
+export GWD_OPT=2
+export KNOB_UGWP_NSLOPE=1
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+
+export DO_GSL_DRAG_TOFD=.false.
+export CDMBWD=${CDMBWD_c96}
+
+# RRTMGP
+export DO_RRTMGP=.false.
+export DOGP_CLDOPTICS_LUT=.true.
+export DOGP_LWSCAT=.true.
+export DOGP_SGS_CNV=.true.
+
+# UGWD
+export DO_UGWP_V0=.true.
+export DO_UGWP_V1=.false.
+export DO_GSL_DRAG_LS_BL=.false.
+export KNOB_UGWP_VERSION=0
+
+# CA
+export DO_CA=.true.
+export CA_SGS=.true.
+export CA_GLOBAL=.false.
+export NCA=1
+export NCELLS=5
+export NLIVES=12
+export NTHRESH=18
+export NSEED=1
+export NFRACSEED=0.5
+export CA_TRIGGER=.true.
+export NSPINUP=1
+export ISEED_CA=12345
+
+export FSICL=0
+export FSICS=0
+
+export USE_CICE_ALB=.true.
+export MIN_SEAICE=1.0e-6
+export DNATS=2
+export IMP_PHYSICS=8
+export LGFDLMPRAD=.false.
+export DO_SAT_ADJ=.false.
+export SATMEDMF=.true.
+
+export CPLFLX=.true.
+export CPLICE=.true.
+export CPL=.true.
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+export USE_MED_FLUX=.false.
+export CPLCHM=.true.
+export CPLLND=.false.
+
+# for FV3: default values will be changed if doing a warm-warm restart
+export WARM_START=.false.
+export MAKE_NH=.true.
+export NA_INIT=1
+export EXTERNAL_IC=.true.
+export NGGPS_IC=.true.
+export MOUNTAIN=.false.
+# gocart inst_aod output; uses AERO_HIST.rc.IN from parm/gocart directory
+export AOD_FRQ=060000
+
+# checkpoint restarts
+export RESTART_FILE_PREFIX=''
+export RESTART_FILE_SUFFIX_SECS=''
+export RT35D=''
 }
 export_35d_run ()
 {
@@ -1298,350 +1413,351 @@ export_hafs_regional ()
 
 export_hafs ()
 {
-  export FV3=true
-  export S2S=false
-  export HAFS=true
-  export AQM=false
-  export DATM_CDEPS=false
-  export DOCN_CDEPS=false
-  export CDEPS_INLINE=false
-  export INPES=${INPES_dflt}
-  export JNPES=${JNPES_dflt}
-  export NTILES=1
-  export IMFSHALCNV=2
-  export IMFDEEPCNV=2
-  export HYBEDMF=.false.
-  export SATMEDMF=.true.
-  export MONINQ_FAC=-1.0
-  export HURR_PBL=.true.
-  export ISATMEDMF=1
-  export IOPT_SFC=1
-  export IOPT_DVEG=2
-  export IOPT_CRS=1
-  export IOPT_RAD=1
-  export IOPT_ALB=2
-  export IOPT_STC=1
-  export LSM=1
-  export DO_GSL_DRAG_LS_BL=.true.
-  export DO_GSL_DRAG_SS=.true.
-  export DO_GSL_DRAG_TOFD=.true.
-  export IMP_PHYSICS=11
-  export IAER=111
-  export CNVGWD=.false.
-  export LTAEROSOL=.false.
-  export CDMBWD=1.0,1.0,1.0,1.0
-  export LHEATSTRG=.false.
-  export LRADAR=.true.
-
-  export FV_CORE_TAU=5.
-  export RF_CUTOFF=30.e2
-  export RF_CUTOFF_NEST=50.e2
-
-  export IS_MOVING_NEST=".false."
-  export VORTEX_TRACKER=0
-  export NTRACK=0
-  export MOVE_CD_X=0
-  export MOVE_CD_Y=0
-  export CPL_IMP_MRG=.true.
-
-  export OUTPUT_GRID=''
-  export IMO=''
-  export JMO=''
-  export CEN_LON=''
-  export CEN_LAT=''
-  export LON1=''
-  export LAT1=''
-  export LON2=''
-  export LAT2=''
-  export DLON=''
-  export DLAT=''
-  export STDLAT1=''
-  export STDLAT2=''
-  export NX=''
-  export NY=''
-  export DX=''
-  export DY=''
-
-  export OUTPUT_GRID_2=''
-  export IMO_2=''
-  export JMO_2=''
-  export CEN_LON_2=''
-  export CEN_LAT_2=''
-  export LON1_2=''
-  export LAT1_2=''
-  export LON2_2=''
-  export LAT2_2=''
-  export DLON_2=''
-  export DLAT_2=''
-  export STDLAT1_2=''
-  export STDLAT2_2=''
-  export NX_2=''
-  export NY_2=''
-  export DX_2=''
-  export DY_2=''
-
-  export OUTPUT_GRID_3=''
-  export IMO_3=''
-  export JMO_3=''
-  export CEN_LON_3=''
-  export CEN_LAT_3=''
-  export LON1_3=''
-  export LAT1_3=''
-  export LON2_3=''
-  export LAT2_3=''
-  export DLON_3=''
-  export DLAT_3=''
-  export STDLAT1_3=''
-  export STDLAT2_3=''
-  export NX_3=''
-  export NY_3=''
-  export DX_3=''
-  export DY_3=''
-
-  export OUTPUT_GRID_4=''
-  export IMO_4=''
-  export JMO_4=''
-  export CEN_LON_4=''
-  export CEN_LAT_4=''
-  export LON1_4=''
-  export LAT1_4=''
-  export LON2_4=''
-  export LAT2_4=''
-  export DLON_4=''
-  export DLAT_4=''
-  export STDLAT1_4=''
-  export STDLAT2_4=''
-  export NX_4=''
-  export NY_4=''
-  export DX_4=''
-  export DY_4=''
-
-  export OUTPUT_GRID_5=''
-  export IMO_5=''
-  export JMO_5=''
-  export CEN_LON_5=''
-  export CEN_LAT_5=''
-  export LON1_5=''
-  export LAT1_5=''
-  export LON2_5=''
-  export LAT2_5=''
-  export DLON_5=''
-  export DLAT_5=''
-  export STDLAT1_5=''
-  export STDLAT2_5=''
-  export NX_5=''
-  export NY_5=''
-  export DX_5=''
-  export DY_5=''
-
-  export OUTPUT_GRID_6=''
-  export IMO_6=''
-  export JMO_6=''
-  export CEN_LON_6=''
-  export CEN_LAT_6=''
-  export LON1_6=''
-  export LAT1_6=''
-  export LON2_6=''
-  export LAT2_6=''
-  export DLON_6=''
-  export DLAT_6=''
-  export STDLAT1_6=''
-  export STDLAT2_6=''
-  export NX_6=''
-  export NY_6=''
-  export DX_6=''
-  export DY_6=''
-
-  export OUTPUT_FH='3 -1'
+export_fv3_v16
+export FV3=true
+export S2S=false
+export HAFS=true
+export AQM=false
+export DATM_CDEPS=false
+export DOCN_CDEPS=false
+export CDEPS_INLINE=false
+export INPES=${INPES_dflt}
+export JNPES=${JNPES_dflt}
+export NTILES=1
+export IMFSHALCNV=2
+export IMFDEEPCNV=2
+export HYBEDMF=.false.
+export SATMEDMF=.true.
+export MONINQ_FAC=-1.0
+export HURR_PBL=.true.
+export ISATMEDMF=1
+export IOPT_SFC=1
+export IOPT_DVEG=2
+export IOPT_CRS=1
+export IOPT_RAD=1
+export IOPT_ALB=2
+export IOPT_STC=1
+export LSM=1
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export IMP_PHYSICS=11
+export IAER=111
+export CNVGWD=.false.
+export LTAEROSOL=.false.
+export CDMBWD=1.0,1.0,1.0,1.0
+export LHEATSTRG=.false.
+export LRADAR=.true.
+
+export FV_CORE_TAU=5.
+export RF_CUTOFF=30.e2
+export RF_CUTOFF_NEST=50.e2
+
+export IS_MOVING_NEST=".false."
+export VORTEX_TRACKER=0
+export NTRACK=0
+export MOVE_CD_X=0
+export MOVE_CD_Y=0
+export CPL_IMP_MRG=.true.
+
+export OUTPUT_GRID=''
+export IMO=''
+export JMO=''
+export CEN_LON=''
+export CEN_LAT=''
+export LON1=''
+export LAT1=''
+export LON2=''
+export LAT2=''
+export DLON=''
+export DLAT=''
+export STDLAT1=''
+export STDLAT2=''
+export NX=''
+export NY=''
+export DX=''
+export DY=''
+
+export OUTPUT_GRID_2=''
+export IMO_2=''
+export JMO_2=''
+export CEN_LON_2=''
+export CEN_LAT_2=''
+export LON1_2=''
+export LAT1_2=''
+export LON2_2=''
+export LAT2_2=''
+export DLON_2=''
+export DLAT_2=''
+export STDLAT1_2=''
+export STDLAT2_2=''
+export NX_2=''
+export NY_2=''
+export DX_2=''
+export DY_2=''
+
+export OUTPUT_GRID_3=''
+export IMO_3=''
+export JMO_3=''
+export CEN_LON_3=''
+export CEN_LAT_3=''
+export LON1_3=''
+export LAT1_3=''
+export LON2_3=''
+export LAT2_3=''
+export DLON_3=''
+export DLAT_3=''
+export STDLAT1_3=''
+export STDLAT2_3=''
+export NX_3=''
+export NY_3=''
+export DX_3=''
+export DY_3=''
+
+export OUTPUT_GRID_4=''
+export IMO_4=''
+export JMO_4=''
+export CEN_LON_4=''
+export CEN_LAT_4=''
+export LON1_4=''
+export LAT1_4=''
+export LON2_4=''
+export LAT2_4=''
+export DLON_4=''
+export DLAT_4=''
+export STDLAT1_4=''
+export STDLAT2_4=''
+export NX_4=''
+export NY_4=''
+export DX_4=''
+export DY_4=''
+
+export OUTPUT_GRID_5=''
+export IMO_5=''
+export JMO_5=''
+export CEN_LON_5=''
+export CEN_LAT_5=''
+export LON1_5=''
+export LAT1_5=''
+export LON2_5=''
+export LAT2_5=''
+export DLON_5=''
+export DLAT_5=''
+export STDLAT1_5=''
+export STDLAT2_5=''
+export NX_5=''
+export NY_5=''
+export DX_5=''
+export DY_5=''
+
+export OUTPUT_GRID_6=''
+export IMO_6=''
+export JMO_6=''
+export CEN_LON_6=''
+export CEN_LAT_6=''
+export LON1_6=''
+export LAT1_6=''
+export LON2_6=''
+export LAT2_6=''
+export DLON_6=''
+export DLAT_6=''
+export STDLAT1_6=''
+export STDLAT2_6=''
+export NX_6=''
+export NY_6=''
+export DX_6=''
+export DY_6=''
+
+export OUTPUT_FH='3 -1'
 }
 
 export_hrrr() {
-  export_fv3
-  export NPZ=127
-  export NPZP=128
-  export DT_ATMOS=300
-  export SYEAR=2021
-  export SMONTH=03
-  export SDAY=22
-  export SHOUR=06
-  export OUTPUT_GRID='gaussian_grid'
-  export NSTF_NAME='2,0,0,0,0'
-  export WRITE_DOPOST=.true.
-  export IAER=5111
-  export FHMAX=12
-
-  export FRAC_GRID=.false.
-  export FRAC_ICE=.true.
-
-  export FV_CORE_TAU=10.
-  export RF_CUTOFF=7.5e2
-
-  export FV3_RUN=lake_control_run.IN
-  export CCPP_SUITE=FV3_HRRR
-  export INPUT_NML=rap.nml.IN
-  export FIELD_TABLE=field_table_thompson_aero_tke
-  export NEW_DIAGTABLE=diag_table_rap
-
-  export SFCLAY_COMPUTE_FLUX=.true.
-
-  export LKM=1
-  export IOPT_LAKE=2
-  export IMP_PHYSICS=8
-  export DNATS=0
-  export DO_SAT_ADJ=.false.
-  export LRADAR=.true.
-  export LTAEROSOL=.true.
-  export IALB=2
-  export IEMS=2
-  export HYBEDMF=.false.
-  export DO_MYNNEDMF=.true.
-  export DO_MYNNSFCLAY=.true.
-  export DO_DEEP=.false.
-  export SHAL_CNV=.false.
-  export IMFSHALCNV=-1
-  export IMFDEEPCNV=-1
-  export LHEATSTRG=.false.
-  export LSM=3
-  export LSOIL_LSM=9
-  export KICE=9
-
-  export GWD_OPT=3
-  export DO_UGWP_V0=.false.
-  export DO_UGWP_V0_OROG_ONLY=.false.
-  export DO_GSL_DRAG_LS_BL=.true.
-  export DO_GSL_DRAG_SS=.true.
-  export DO_GSL_DRAG_TOFD=.true.
-  export DO_UGWP_V1=.false.
-  export DO_UGWP_V1_OROG_ONLY=.false.
+export_fv3_v16
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=300
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+export FHMAX=12
+
+export FRAC_GRID=.false.
+export FRAC_ICE=.true.
+
+export FV_CORE_TAU=10.
+export RF_CUTOFF=7.5e2
+
+export FV3_RUN=lake_control_run.IN
+export CCPP_SUITE=FV3_HRRR
+export INPUT_NML=rap.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke
+export NEW_DIAGTABLE=diag_table_rap
+
+export SFCLAY_COMPUTE_FLUX=.true.
+
+export LKM=1
+export IOPT_LAKE=2
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export IALB=2
+export IEMS=2
+export HYBEDMF=.false.
+export DO_MYNNEDMF=.true.
+export DO_MYNNSFCLAY=.true.
+export DO_DEEP=.false.
+export SHAL_CNV=.false.
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
+export LHEATSTRG=.false.
+export LSM=3
+export LSOIL_LSM=9
+export KICE=9
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
 }
 
 export_hrrr_conus13km()
 {
-  export_fv3
-  export SYEAR=2021
-  export SMONTH=05
-  export SDAY=12
-  export SHOUR=16
-  export FHMAX=2
-  export DT_ATMOS=120
-  export RESTART_INTERVAL=1
-  export QUILTING=.true.
-  export WRITE_GROUP=1
-  export WRTTASK_PER_GROUP=6
-  export NTILES=1
-  export WRITE_DOPOST=.false.
-  export OUTPUT_HISTORY=.true.
-  export OUTPUT_GRID=lambert_conformal
-  export OUTPUT_FILE="'netcdf'"
-
-  # Revert these two to GFS_typedefs defaults to avoid a crash:
-  export SEDI_SEMI=.false.
-  export DECFL=8
-
-  export RRFS_SMOKE=.true.
-  export SEAS_OPT=0
-
-  export LKM=1
-  export SFCLAY_COMPUTE_FLUX=.true.
-  export IALB=2
-  export ICLIQ_SW=2
-  export IEMS=2
-  export IOVR=3
-  export KICE=9
-  export LSM=3
-  export LSOIL_LSM=9
-  export DO_MYNNSFCLAY=.true.
-  export DO_MYNNEDMF=.true.
-  export HYBEDMF=.false.
-  export SHAL_CNV=.false.
-  export DO_SAT_ADJ=.false.
-  export DO_DEEP=.false.
-  export CCPP_SUITE='FV3_HRRR'
-  export INPES=12
-  export JNPES=12
-  export NPX=397
-  export NPY=233
-  export NPZ=65
-  export MAKE_NH=.false.
-  export NA_INIT=0
-  export DNATS=0
-  export EXTERNAL_IC=.false.
-  export NGGPS_IC=.false.
-  export MOUNTAIN=.true.
-  export WARM_START=.true.
-  export READ_INCREMENT=.false.
-  export RES_LATLON_DYNAMICS="'fv3_increment.nc'"
-  export NPZP=66
-  export FHZERO=1.0
-  export IMP_PHYSICS=8
-  export LDIAG3D=.false.
-  export QDIAG3D=.false.
-  export PRINT_DIFF_PGR=.true.
-  export FHCYC=0.0
-  export IAER=1011
-  export LHEATSTRG=.false.
-  export RANDOM_CLDS=.false.
-  export CNVCLD=.false.
-  export IMFSHALCNV=-1
-  export IMFDEEPCNV=-1
-  export CDMBWD='3.5,1.0'
-  export DO_SPPT=.false.
-  export DO_SHUM=.false.
-  export DO_SKEB=.false.
-  export LNDP_TYPE=0
-  export N_VAR_LNDP=0
-
-  export GWD_OPT=3
-  export DO_UGWP_V0=.false.
-  export DO_UGWP_V0_OROG_ONLY=.false.
-  export DO_GSL_DRAG_LS_BL=.true.
-  export DO_GSL_DRAG_SS=.true.
-  export DO_GSL_DRAG_TOFD=.true.
-  export DO_UGWP_V1=.false.
-  export DO_UGWP_V1_OROG_ONLY=.false.
-
-  export FV3_RUN=rrfs_warm_run.IN
-  export INPUT_NML=rrfs_conus13km_hrrr.nml.IN
-  export FIELD_TABLE=field_table_thompson_aero_tke_smoke
-  export DIAG_TABLE=diag_table_hrrr
-  export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
-  export DIAG_TABLE_ADDITIONAL=diag_additional_rrfs_smoke
-  export FRAC_ICE=.true.
+export_fv3_v16
+export SYEAR=2021
+export SMONTH=05
+export SDAY=12
+export SHOUR=16
+export FHMAX=2
+export DT_ATMOS=120
+export RESTART_INTERVAL=1
+export QUILTING=.true.
+export WRITE_GROUP=1
+export WRTTASK_PER_GROUP=6
+export NTILES=1
+export WRITE_DOPOST=.false.
+export OUTPUT_HISTORY=.true.
+export OUTPUT_GRID=lambert_conformal
+export OUTPUT_FILE="'netcdf'"
+
+# Revert these two to GFS_typedefs defaults to avoid a crash:
+export SEDI_SEMI=.false.
+export DECFL=8
+
+export RRFS_SMOKE=.true.
+export SEAS_OPT=0
+
+export LKM=1
+export SFCLAY_COMPUTE_FLUX=.true.
+export IALB=2
+export ICLIQ_SW=2
+export IEMS=2
+export IOVR=3
+export KICE=9
+export LSM=3
+export LSOIL_LSM=9
+export DO_MYNNSFCLAY=.true.
+export DO_MYNNEDMF=.true.
+export HYBEDMF=.false.
+export SHAL_CNV=.false.
+export DO_SAT_ADJ=.false.
+export DO_DEEP=.false.
+export CCPP_SUITE='FV3_HRRR'
+export INPES=12
+export JNPES=12
+export NPX=397
+export NPY=233
+export NPZ=65
+export MAKE_NH=.false.
+export NA_INIT=0
+export DNATS=0
+export EXTERNAL_IC=.false.
+export NGGPS_IC=.false.
+export MOUNTAIN=.true.
+export WARM_START=.true.
+export READ_INCREMENT=.false.
+export RES_LATLON_DYNAMICS="'fv3_increment.nc'"
+export NPZP=66
+export FHZERO=1.0
+export IMP_PHYSICS=8
+export LDIAG3D=.false.
+export QDIAG3D=.false.
+export PRINT_DIFF_PGR=.true.
+export FHCYC=0.0
+export IAER=1011
+export LHEATSTRG=.false.
+export RANDOM_CLDS=.false.
+export CNVCLD=.false.
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
+export CDMBWD='3.5,1.0'
+export DO_SPPT=.false.
+export DO_SHUM=.false.
+export DO_SKEB=.false.
+export LNDP_TYPE=0
+export N_VAR_LNDP=0
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+
+export FV3_RUN=rrfs_warm_run.IN
+export INPUT_NML=rrfs_conus13km_hrrr.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke_smoke
+export DIAG_TABLE=diag_table_hrrr
+export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
+export DIAG_TABLE_ADDITIONAL=diag_additional_rrfs_smoke
+export FRAC_ICE=.true.
 }
 
 export_rap_common()
 {
-export_fv3
-  export NPZ=127
-  export NPZP=128
-  export DT_ATMOS=300
-  export SYEAR=2021
-  export SMONTH=03
-  export SDAY=22
-  export SHOUR=06
-  export OUTPUT_GRID='gaussian_grid'
-  export NSTF_NAME='2,0,0,0,0'
-  export WRITE_DOPOST=.true.
-  export IAER=5111
-
-  export FV_CORE_TAU=10.
-  export RF_CUTOFF=7.5e2
-
-  export FV3_RUN=control_run.IN
-  export INPUT_NML=rap.nml.IN
-  export FIELD_TABLE=field_table_thompson_aero_tke
-
-  export LHEATSTRG=.false.
-  export IMP_PHYSICS=8
-  export DNATS=0
-  export DO_SAT_ADJ=.false.
-  export LRADAR=.true.
-  export LTAEROSOL=.true.
-  export IALB=2
-  export IEMS=2
-  export HYBEDMF=.false.
-  export DO_MYNNEDMF=.true.
-  export DO_MYNNSFCLAY=.true.
+export_fv3_v16
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=300
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+
+export FV_CORE_TAU=10.
+export RF_CUTOFF=7.5e2
+
+export FV3_RUN=control_run.IN
+export INPUT_NML=rap.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke
+
+export LHEATSTRG=.false.
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export IALB=2
+export IEMS=2
+export HYBEDMF=.false.
+export DO_MYNNEDMF=.true.
+export DO_MYNNSFCLAY=.true.
 }
 
 export_rap()
diff --git a/tests/fv3_conf/fv3_slurm.IN_hera b/tests/fv3_conf/fv3_slurm.IN_hera
index 94c3827525..288b0ec78b 100644
--- a/tests/fv3_conf/fv3_slurm.IN_hera
+++ b/tests/fv3_conf/fv3_slurm.IN_hera
@@ -15,9 +15,9 @@ date_s_start=$(date +%s)
 echo -n "${date_s_start}," > job_timestamp.txt
 
 set +x
-#MACHINE_ID=hera
+export MACHINE_ID=hera
 source ./module-setup.sh
-module use "@[PWD]/modulefiles"
+module use "${PWD}/modulefiles"
 module load modules.fv3
 module list
 set -x
@@ -27,7 +27,8 @@ echo "Model started: ${date_start}"
 
 export MPI_TYPE_DEPTH=20
 export OMP_STACKSIZE=512M
-export OMP_NUM_THREADS="@[THRD]"
+# shellcheck disable=SC2125
+export OMP_NUM_THREADS=@[THRD]
 export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
@@ -37,7 +38,8 @@ export PSM_SHAREDCONTEXTS=1
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1
 
-srun --label -n "@[TASKS]" ./fv3.exe
+# shellcheck disable=SC2102
+srun --label -n @[TASKS] ./fv3.exe
 
 date_end=$(date)
 echo "Model ended: ${date_end}"
diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
index afd7aa49d4..1c5bcbbd00 100644
--- a/tests/logs/OpnReqTests_control_p8_hera.log
+++ b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Tue Apr 16 13:22:38 UTC 2024
+Wed Apr 24 12:38:17 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_1950363/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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                        = 272.948924
-  0: The maximum resident set size (KB)                   = 1272740
+  0: The total amount of wall time                        = 276.967845
+  0: The maximum resident set size (KB)                   = 1253216
 
 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_1950363/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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                        = 982.571241
-  0: The maximum resident set size (KB)                   = 1255996
+  0: The total amount of wall time                        = 960.176678
+  0: The maximum resident set size (KB)                   = 1233464
 
 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_1950363/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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                        = 236.873154
-  0: The maximum resident set size (KB)                   = 1244612
+  0: The total amount of wall time                        = 238.109868
+  0: The maximum resident set size (KB)                   = 1235600
 
 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_1950363/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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                        = 237.434427
-  0: The maximum resident set size (KB)                   = 1248872
+  0: The total amount of wall time                        = 239.999110
+  0: The maximum resident set size (KB)                   = 1231020
 
 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_1950363/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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.270533
-  0: The maximum resident set size (KB)                   = 1247316
+  0: The total amount of wall time                        = 241.494846
+  0: The maximum resident set size (KB)                   = 1230996
 
 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_1950363/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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.823501
-  0: The maximum resident set size (KB)                   = 1249892
+  0: The total amount of wall time                        = 240.187367
+  0: The maximum resident set size (KB)                   = 1237016
 
 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_1950363/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/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                        = 243.670791
-  0: The maximum resident set size (KB)                   = 1247032
+  0: The total amount of wall time                        = 239.880609
+  0: The maximum resident set size (KB)                   = 1228084
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Tue Apr 16 14:27:37 UTC 2024
-Elapsed time: 01h:05m:00s. Have a nice day!
+Wed Apr 24 13:54:57 UTC 2024
+Elapsed time: 01h:16m:40s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log b/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
index 98e918adf8..29f8955f5e 100644
--- a/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+++ b/tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
@@ -1,9 +1,9 @@
-Tue Apr 16 14:29:26 UTC 2024
+Wed Apr 24 14:04:01 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_2709985/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2151810/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                        = 1353.491600
-  0: The maximum resident set size (KB)                   = 1367696
+  0: The total amount of wall time                        = 1311.811572
+  0: The maximum resident set size (KB)                   = 1340536
 
 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_2709985/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2151810/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                        = 392.059951
-  0: The maximum resident set size (KB)                   = 1358372
+  0: The total amount of wall time                        = 389.794167
+  0: The maximum resident set size (KB)                   = 1341484
 
 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_2709985/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2151810/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                        = 392.603751
-  0: The maximum resident set size (KB)                   = 1359360
+  0: The total amount of wall time                        = 394.333320
+  0: The maximum resident set size (KB)                   = 1339512
 
 Test std_base PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Tue Apr 16 15:32:41 UTC 2024
-Elapsed time: 01h:03m:16s. Have a nice day!
+Wed Apr 24 15:05:09 UTC 2024
+Elapsed time: 01h:01m:09s. Have a nice day!
diff --git a/tests/logs/OpnReqTests_regional_control_hera.log b/tests/logs/OpnReqTests_regional_control_hera.log
index b529e6123d..c62b1ed7b4 100644
--- a/tests/logs/OpnReqTests_regional_control_hera.log
+++ b/tests/logs/OpnReqTests_regional_control_hera.log
@@ -1,9 +1,28 @@
-Tue Apr 16 16:39:38 UTC 2024
+Wed Apr 24 19:38:47 UTC 2024
 Start Operation Requirement Test
 
 
+baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_777322/bit_base_bit_base
+Checking test bit_base results ....
+Moving baseline bit_base files ....
+ Moving dynf000.nc .........OK
+ Moving dynf006.nc .........OK
+ Moving phyf000.nc .........OK
+ Moving phyf006.nc .........OK
+ Moving PRSLEV.GrbF00 .........OK
+ Moving PRSLEV.GrbF06 .........OK
+ Moving NATLEV.GrbF00 .........OK
+ Moving NATLEV.GrbF06 .........OK
+
+  0: The total amount of wall time                        = 1236.978294
+  0: The maximum resident set size (KB)                   = 577672
+
+Test bit_base PASS
+
+
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3012556/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_777322/dcp_dcp
 Checking test dcp results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -14,14 +33,14 @@ Checking test dcp results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 2110.742228
-  0: The maximum resident set size (KB)                   = 556616
+  0: The total amount of wall time                        = 2229.582684
+  0: The maximum resident set size (KB)                   = 541864
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3012556/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_777322/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving dynf000.nc .........OK
@@ -33,14 +52,32 @@ Moving baseline std_base files ....
  Moving NATLEV.GrbF00 .........OK
  Moving NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 2222.730378
-  0: The maximum resident set size (KB)                   = 556012
+  0: The total amount of wall time                        = 2186.237690
+  0: The maximum resident set size (KB)                   = 539180
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3012556/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_777322/std_std
+Checking test std results ....
+ Comparing dynf000.nc .....USING NCCMP......OK
+ Comparing dynf006.nc .....USING NCCMP......OK
+ Comparing phyf000.nc .....USING NCCMP......OK
+ Comparing phyf006.nc .....USING NCCMP......OK
+ Comparing PRSLEV.GrbF00 .....USING CMP......OK
+ Comparing PRSLEV.GrbF06 .....USING CMP......OK
+ Comparing NATLEV.GrbF00 .....USING CMP......OK
+ Comparing NATLEV.GrbF06 .....USING CMP......OK
+
+  0: The total amount of wall time                        = 2172.179940
+  0: The maximum resident set size (KB)                   = 541092
+
+Test std PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_777322/thr_thr
 Checking test thr results ....
  Comparing dynf000.nc .....USING NCCMP......OK
  Comparing dynf006.nc .....USING NCCMP......OK
@@ -51,11 +88,11 @@ Checking test thr results ....
  Comparing NATLEV.GrbF00 .....USING CMP......OK
  Comparing NATLEV.GrbF06 .....USING CMP......OK
 
-  0: The total amount of wall time                        = 2141.980290
-  0: The maximum resident set size (KB)                   = 556516
+  0: The total amount of wall time                        = 2094.600637
+  0: The maximum resident set size (KB)                   = 541332
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Tue Apr 16 18:36:16 UTC 2024
-Elapsed time: 01h:56m:39s. Have a nice day!
+Wed Apr 24 23:19:25 UTC 2024
+Elapsed time: 03h:40m:38s. Have a nice day!
diff --git a/tests/logs/RT-run-Derecho.log b/tests/logs/RT-run-Derecho.log
new file mode 100644
index 0000000000..9dae8589b0
--- /dev/null
+++ b/tests/logs/RT-run-Derecho.log
@@ -0,0 +1,415 @@
+******Regression Testing Script Started******
+derecho6
+Machine: derecho
+Account: nral0032
+rt.sh: Setting up derecho...
+Linking /glade/derecho/scratch/epicufsrt/FV3_RT/rt_128018 to /glade/derecho/scratch/epicufsrt/jenkins/workspace/s-weather-model_pipeline_PR-2241/tests/run_dir
+Run regression test in: /glade/derecho/scratch/epicufsrt/FV3_RT/rt_128018
+rt.sh: Checking & Updating test configuration...
+No update needed to rt.conf
+Verifying ECFLOW support...
+rt_utils.sh: s2swa_32bit_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_p8_mixedmode_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_p8_mixedmode_intel: Creating ECFLOW run task
+rt_utils.sh: s2swa_32bit_pdlib_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_gfsv17_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_gfsv17_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_gfsv17_iau_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_gfsv17_iau_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_gfsv17_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_gfsv17_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_mpi_gfsv17_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_mpi_gfsv17_intel: Creating ECFLOW run task
+rt_utils.sh: s2swa_32bit_pdlib_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_debug_gfsv17_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_debug_gfsv17_intel: Creating ECFLOW run task
+rt_utils.sh: s2swa_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_p8.v2.sfc_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_p8.v2.sfc_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_qr_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_qr_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_qr_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_qr_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_decomp_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_decomp_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_mpi_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_mpi_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_ciceC_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_ciceC_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_c192_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_c192_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_c192_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_c192_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_bmark_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_bmark_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_bmark_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_bmark_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_s2sa_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_s2sa_p8_intel: Creating ECFLOW run task
+rt_utils.sh: s2sw_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_noaero_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_noaero_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_control_nowave_noaero_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_nowave_noaero_p8_intel: Creating ECFLOW run task
+rt_utils.sh: s2swa_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_debug_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_debug_p8_intel: Creating ECFLOW run task
+rt_utils.sh: s2sw_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_debug_noaero_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_debug_noaero_p8_intel: Creating ECFLOW run task
+rt_utils.sh: s2s_aoflux_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_noaero_p8_agrid_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_noaero_p8_agrid_intel: Creating ECFLOW run task
+rt_utils.sh: s2s_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_c48_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_c48_intel: Creating ECFLOW run task
+rt_utils.sh: s2swa_faster_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_p8_faster_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_p8_faster_intel: Creating ECFLOW run task
+rt_utils.sh: s2sw_pdlib_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_control_pdlib_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_control_pdlib_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_restart_pdlib_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_restart_pdlib_p8_intel: Creating ECFLOW run task
+rt_utils.sh: cpld_mpi_pdlib_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_mpi_pdlib_p8_intel: Creating ECFLOW run task
+rt_utils.sh: s2sw_pdlib_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: cpld_debug_pdlib_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: cpld_debug_pdlib_p8_intel: Creating ECFLOW run task
+rt_utils.sh: atm_dyn32_intel: Creating ECFLOW compile task
+rt_utils.sh: control_flake_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_flake_intel: Creating ECFLOW run task
+rt_utils.sh: control_CubedSphereGrid_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_CubedSphereGrid_intel: Creating ECFLOW run task
+rt_utils.sh: control_CubedSphereGrid_parallel_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_CubedSphereGrid_parallel_intel: Creating ECFLOW run task
+rt_utils.sh: control_latlon_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_latlon_intel: Creating ECFLOW run task
+rt_utils.sh: control_wrtGauss_netcdf_parallel_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_wrtGauss_netcdf_parallel_intel: Creating ECFLOW run task
+rt_utils.sh: control_c48_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_c48_intel: Creating ECFLOW run task
+rt_utils.sh: control_c48.v2.sfc_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_c48.v2.sfc_intel: Creating ECFLOW run task
+rt_utils.sh: control_c192_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_c192_intel: Creating ECFLOW run task
+rt_utils.sh: control_c384_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_c384_intel: Creating ECFLOW run task
+rt_utils.sh: control_c384gdas_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_c384gdas_intel: Creating ECFLOW run task
+rt_utils.sh: control_stochy_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_stochy_intel: Creating ECFLOW run task
+rt_utils.sh: control_stochy_restart_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_stochy_restart_intel: Creating ECFLOW run task
+rt_utils.sh: control_lndp_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_lndp_intel: Creating ECFLOW run task
+rt_utils.sh: control_iovr4_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_iovr4_intel: Creating ECFLOW run task
+rt_utils.sh: control_iovr5_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_iovr5_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8.v2.sfc_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8.v2.sfc_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_ugwpv1_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_ugwpv1_intel: Creating ECFLOW run task
+rt_utils.sh: control_restart_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_restart_p8_intel: Creating ECFLOW run task
+rt_utils.sh: control_noqr_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_noqr_p8_intel: Creating ECFLOW run task
+rt_utils.sh: control_restart_noqr_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_restart_noqr_p8_intel: Creating ECFLOW run task
+rt_utils.sh: control_decomp_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_decomp_p8_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_lndp_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_lndp_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_rrtmgp_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_rrtmgp_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_mynn_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_mynn_intel: Creating ECFLOW run task
+rt_utils.sh: merra2_thompson_intel: Computing PET bounds and tasks.
+rt_utils.sh: merra2_thompson_intel: Creating ECFLOW run task
+rt_utils.sh: regional_control_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_control_intel: Creating ECFLOW run task
+rt_utils.sh: regional_restart_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_restart_intel: Creating ECFLOW run task
+rt_utils.sh: regional_decomp_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_decomp_intel: Creating ECFLOW run task
+rt_utils.sh: regional_noquilt_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_noquilt_intel: Creating ECFLOW run task
+rt_utils.sh: regional_netcdf_parallel_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_netcdf_parallel_intel: Creating ECFLOW run task
+rt_utils.sh: regional_2dwrtdecomp_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_2dwrtdecomp_intel: Creating ECFLOW run task
+rt_utils.sh: regional_wofs_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_wofs_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_intel: Creating ECFLOW compile task
+rt_utils.sh: rap_control_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_intel: Creating ECFLOW run task
+rt_utils.sh: regional_spp_sppt_shum_skeb_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_spp_sppt_shum_skeb_intel: Creating ECFLOW run task
+rt_utils.sh: rap_decomp_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_decomp_intel: Creating ECFLOW run task
+rt_utils.sh: rap_restart_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_restart_intel: Creating ECFLOW run task
+rt_utils.sh: rap_sfcdiff_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_sfcdiff_intel: Creating ECFLOW run task
+rt_utils.sh: rap_sfcdiff_decomp_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_sfcdiff_decomp_intel: Creating ECFLOW run task
+rt_utils.sh: rap_sfcdiff_restart_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_sfcdiff_restart_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_decomp_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_decomp_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_2threads_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_2threads_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_restart_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_restart_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_v1beta_intel: Computing PET bounds and tasks.
+rt_utils.sh: rrfs_v1beta_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_v1nssl_intel: Computing PET bounds and tasks.
+rt_utils.sh: rrfs_v1nssl_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_v1nssl_nohailnoccn_intel: Computing PET bounds and tasks.
+rt_utils.sh: rrfs_v1nssl_nohailnoccn_intel: Creating ECFLOW run task
+rt_utils.sh: csawmg_intel: Creating ECFLOW compile task
+rt_utils.sh: control_csawmg_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_csawmg_intel: Creating ECFLOW run task
+rt_utils.sh: control_ras_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_ras_intel: Creating ECFLOW run task
+rt_utils.sh: wam_intel: Creating ECFLOW compile task
+rt_utils.sh: control_wam_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_wam_intel: Creating ECFLOW run task
+rt_utils.sh: atm_faster_dyn32_intel: Creating ECFLOW compile task
+rt_utils.sh: control_p8_faster_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_faster_intel: Creating ECFLOW run task
+rt_utils.sh: regional_control_faster_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_control_faster_intel: Creating ECFLOW run task
+rt_utils.sh: atm_debug_dyn32_intel: Creating ECFLOW compile task
+rt_utils.sh: control_CubedSphereGrid_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_CubedSphereGrid_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_wrtGauss_netcdf_parallel_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_wrtGauss_netcdf_parallel_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_stochy_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_stochy_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_lndp_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_lndp_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_csawmg_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_csawmg_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_ras_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_ras_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_diag_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_diag_debug_intel: Creating ECFLOW run task
+rt_utils.sh: control_debug_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_debug_p8_intel: Creating ECFLOW run task
+rt_utils.sh: regional_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_control_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_debug_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_debug_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_gf_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_gf_debug_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_c3_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_c3_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_unified_drag_suite_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_unified_drag_suite_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_diag_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_diag_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_cires_ugwp_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_cires_ugwp_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_unified_ugwp_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_unified_ugwp_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_lndp_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_lndp_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_progcld_thompson_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_progcld_thompson_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_noah_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_noah_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_sfcdiff_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_sfcdiff_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_noah_sfcdiff_cires_ugwp_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_noah_sfcdiff_cires_ugwp_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_v1beta_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rrfs_v1beta_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_clm_lake_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_clm_lake_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rap_flake_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_flake_debug_intel: Creating ECFLOW run task
+rt_utils.sh: gnv1_c96_no_nest_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: gnv1_c96_no_nest_debug_intel: Creating ECFLOW run task
+rt_utils.sh: wam_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: control_wam_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_wam_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_dyn32_phy32_intel: Creating ECFLOW compile task
+rt_utils.sh: regional_spp_sppt_shum_skeb_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_spp_sppt_shum_skeb_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: rap_control_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_decomp_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_decomp_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: rap_restart_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_restart_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_restart_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_restart_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_dyn32_phy32_faster_intel: Creating ECFLOW compile task
+rt_utils.sh: conus13km_control_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_control_intel: Creating ECFLOW run task
+rt_utils.sh: conus13km_2threads_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_2threads_intel: Creating ECFLOW run task
+rt_utils.sh: conus13km_restart_mismatch_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_restart_mismatch_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_dyn64_phy32_intel: Creating ECFLOW compile task
+rt_utils.sh: rap_control_dyn64_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_dyn64_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_dyn32_phy32_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: rap_control_debug_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_debug_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: hrrr_control_debug_dyn32_phy32_intel: Computing PET bounds and tasks.
+rt_utils.sh: hrrr_control_debug_dyn32_phy32_intel: Creating ECFLOW run task
+rt_utils.sh: conus13km_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_debug_intel: Creating ECFLOW run task
+rt_utils.sh: conus13km_debug_qr_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_debug_qr_intel: Creating ECFLOW run task
+rt_utils.sh: conus13km_radar_tten_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: conus13km_radar_tten_debug_intel: Creating ECFLOW run task
+rt_utils.sh: rrfs_dyn64_phy32_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: rap_control_dyn64_phy32_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: rap_control_dyn64_phy32_debug_intel: Creating ECFLOW run task
+rt_utils.sh: hafsw_intel: Creating ECFLOW compile task
+rt_utils.sh: hafs_regional_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_atm_thompson_gfdlsf_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_atm_thompson_gfdlsf_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_atm_ocn_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_atm_ocn_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_atm_wav_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_atm_wav_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_atm_ocn_wav_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_atm_ocn_wav_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_1nest_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_1nest_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_telescopic_2nests_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_telescopic_2nests_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_global_1nest_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_global_1nest_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_global_multiple_4nests_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_global_multiple_4nests_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_specified_moving_1nest_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_specified_moving_1nest_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_global_storm_following_1nest_atm_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_global_storm_following_1nest_atm_intel: Creating ECFLOW run task
+rt_utils.sh: gnv1_nested_intel: Computing PET bounds and tasks.
+rt_utils.sh: gnv1_nested_intel: Creating ECFLOW run task
+rt_utils.sh: hafsw_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_debug_intel: Creating ECFLOW run task
+rt_utils.sh: hafsw_faster_intel: Creating ECFLOW compile task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_mom6w_intel: Creating ECFLOW compile task
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_all_intel: Creating ECFLOW compile task
+rt_utils.sh: hafs_regional_docn_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_docn_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_docn_oisst_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_docn_oisst_intel: Creating ECFLOW run task
+rt_utils.sh: hafs_regional_datm_cdeps_intel: Computing PET bounds and tasks.
+rt_utils.sh: hafs_regional_datm_cdeps_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_intel: Creating ECFLOW compile task
+rt_utils.sh: datm_cdeps_control_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_control_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_restart_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_restart_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_control_gefs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_control_gefs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_iau_gefs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_iau_gefs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_stochy_gefs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_stochy_gefs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_ciceC_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_ciceC_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_bulk_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_bulk_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_bulk_gefs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_bulk_gefs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_mx025_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_mx025_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_mx025_gefs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_mx025_gefs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_multiple_files_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_multiple_files_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_3072x1536_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_3072x1536_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_gfs_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_gfs_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: datm_cdeps_debug_cfsr_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_debug_cfsr_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_faster_intel: Creating ECFLOW compile task
+rt_utils.sh: datm_cdeps_control_cfsr_faster_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_control_cfsr_faster_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_land_intel: Creating ECFLOW compile task
+rt_utils.sh: datm_cdeps_lnd_gswp3_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_lnd_gswp3_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_lnd_era5_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_lnd_era5_intel: Creating ECFLOW run task
+rt_utils.sh: datm_cdeps_lnd_era5_rst_intel: Computing PET bounds and tasks.
+rt_utils.sh: datm_cdeps_lnd_era5_rst_intel: Creating ECFLOW run task
+rt_utils.sh: atml_intel: Creating ECFLOW compile task
+rt_utils.sh: control_p8_atmlnd_sbs_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_atmlnd_sbs_intel: Creating ECFLOW run task
+rt_utils.sh: control_p8_atmlnd_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_p8_atmlnd_intel: Creating ECFLOW run task
+rt_utils.sh: control_restart_p8_atmlnd_intel: Computing PET bounds and tasks.
+rt_utils.sh: control_restart_p8_atmlnd_intel: Creating ECFLOW run task
+rt_utils.sh: atmw_intel: Creating ECFLOW compile task
+rt_utils.sh: atmwav_control_noaero_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: atmwav_control_noaero_p8_intel: Creating ECFLOW run task
+rt_utils.sh: atmaero_intel: Creating ECFLOW compile task
+rt_utils.sh: atmaero_control_p8_intel: Computing PET bounds and tasks.
+rt_utils.sh: atmaero_control_p8_intel: Creating ECFLOW run task
+rt_utils.sh: atmaero_control_p8_rad_intel: Computing PET bounds and tasks.
+rt_utils.sh: atmaero_control_p8_rad_intel: Creating ECFLOW run task
+rt_utils.sh: atmaero_control_p8_rad_micro_intel: Computing PET bounds and tasks.
+rt_utils.sh: atmaero_control_p8_rad_micro_intel: Creating ECFLOW run task
+rt_utils.sh: atmaq_debug_intel: Creating ECFLOW compile task
+rt_utils.sh: regional_atmaq_debug_intel: Computing PET bounds and tasks.
+rt_utils.sh: regional_atmaq_debug_intel: Creating ECFLOW run task
+rt_utils.sh: Starting ECFLOW run
+ECF_HOST: derecho6, ECF_PORT: 39982
+ecflow_server is NOT running on derecho6:39982
+Wed 24 Apr 2024 12:50:01 PM UTC
+
+User "38482" attempting to start ecf server on "derecho6" using ECF_PORT "39982" and with:
+ECF_HOME     : "/glade/derecho/scratch/epicufsrt/FV3_RT/rt_128018/ecflow_server"
+ECF_LOG      : "derecho6.39982.ecf.log"
+ECF_CHECK    : "derecho6.39982.check"
+ECF_CHECKOLD : "derecho6.39982.check.b"
+ECF_OUT      : "/dev/null"
+
+client version is Ecflow version(5.8.4) boost(1.78.0) compiler(gcc 12.2.0) protocol(JSON cereal 1.3.0) openssl(enabled) Compiled on Sep 20 2023 09:36:19
+Checking if the server is already running on derecho6 and port 39982
+
+Backing up check point and log files
+
+OK starting ecFlow server...
+
+Placing server into RESTART mode...
+restart of server failed
+rt.sh finished
+rt.sh: Cleaning up...
+rt_utils.sh: Stopping ECFLOW Workflow...
diff --git a/tests/logs/RT-run-Hercules.log b/tests/logs/RT-run-Hercules.log
new file mode 100644
index 0000000000..393c54d52a
--- /dev/null
+++ b/tests/logs/RT-run-Hercules.log
@@ -0,0 +1,16 @@
+******Regression Testing Script Started******
+hercules-login-1.hpc.msstate.edu
+Machine: hercules
+Account: epic
+rt.sh: Setting up hercules...
+Linking /work2/noaa/epic/stmp/role-epic/stmp/role-epic/FV3_RT/rt_3789786 to /work/noaa/epic/role-epic/jenkins/workspace/s-weather-model_pipeline_PR-2241/tests/run_dir
+Run regression test in: /work2/noaa/epic/stmp/role-epic/stmp/role-epic/FV3_RT/rt_3789786
+rt.sh: Checking & Updating test configuration...
+No update needed to rt.conf
+rt.sh: Getting error information...
+Exited at line 1062 having code 1
+rt.sh: Exited abnormally, killing workflow and cleaning up
+rt_utils.sh: Killing ECFLOW Workflow...
+rt.sh finished
+rt.sh: Cleaning up...
+rt_utils.sh: Stopping ECFLOW Workflow...
diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
index d6b98a0857..19ed992c48 100644
--- a/tests/logs/RegressionTests_acorn.log
+++ b/tests/logs/RegressionTests_acorn.log
@@ -1,7 +1,7 @@
 ====START OF ACORN REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-ffacfb6d50c9803809d458a42c634f89aaec8861
+64df90f39f00b9682ca74b29f783bd0a37994a4a
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,34 +11,327 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- cbd207b7e6376f71a58c8e79b477eac55b59f28b FV3 (remotes/origin/nesting-fixes)
- d14b3cbe2135727e3251d9045b3459a0b2d286a0 FV3/atmos_cubed_sphere (201912_public_release-390-gd14b3cb)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 7dc4d9ba48dea57f88f4f10091c8c2042105954e stochastic_physics (ufs-v2.0.0-210-g7dc4d9b)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
+
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_44890
+
+RT.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: GFS-DEV
+* (-e) - USE ECFLOW
+
+PASS -- COMPILE 's2swa_32bit_intel' [11:24, 10:44]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [58:24, 01:49](3039 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [16:29, 15:52]
+PASS -- TEST 'cpld_control_gfsv17_intel' [52:45, 02:03](1649 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [14:56, 03:20](1773 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [14:30, 02:29](900 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [52:17, 02:51](1622 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [05:18, 04:19]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [04:31, 03:10](1683 MB)
+
+PASS -- COMPILE 's2swa_intel' [11:24, 10:44]
+PASS -- TEST 'cpld_control_p8_intel' [58:24, 01:33](3065 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [58:24, 02:02](3066 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [49:22, 01:39](3121 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [58:24, 01:32](3089 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [49:22, 02:16](3142 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [58:24, 01:25](3379 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [58:24, 02:01](3064 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [58:25, 01:50](2994 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [58:24, 01:57](3065 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [58:24, 02:16](3031 MB)
+
+PASS -- COMPILE 's2sw_intel' [10:23, 10:10]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [59:25, 01:06](1644 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [59:25, 01:29](1696 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [10:23, 09:33]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [59:25, 01:30](1697 MB)
+
+PASS -- COMPILE 's2s_intel' [10:24, 09:33]
+PASS -- TEST 'cpld_control_c48_intel' [59:23, 01:03](2672 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [16:30, 15:39]
+PASS -- TEST 'cpld_control_p8_faster_intel' [52:15, 02:16](3068 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [16:30, 16:00]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [50:41, 01:36](1667 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [12:38, 01:33](972 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [11:13, 01:17](1638 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [04:18, 04:03]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [05:31, 01:23](1687 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [10:23, 09:51]
+PASS -- TEST 'control_flake_intel' [55:07, 01:02](634 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [55:07, 00:41](1528 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [55:07, 00:47](1542 MB)
+PASS -- TEST 'control_latlon_intel' [55:07, 00:44](1538 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [55:07, 00:54](1530 MB)
+PASS -- TEST 'control_c48_intel' [55:06, 01:09](1611 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [55:06, 00:46](736 MB)
+PASS -- TEST 'control_c192_intel' [55:07, 00:54](1649 MB)
+PASS -- TEST 'control_c384_intel' [55:11, 01:52](1966 MB)
+PASS -- TEST 'control_c384gdas_intel' [55:11, 02:44](1150 MB)
+PASS -- TEST 'control_stochy_intel' [55:07, 00:55](590 MB)
+PASS -- TEST 'control_stochy_restart_intel' [36:18, 00:21](392 MB)
+PASS -- TEST 'control_lndp_intel' [55:07, 01:00](589 MB)
+FAILED: RUN DID NOT COMPLETE -- TEST 'control_iovr4_intel' [, ]( MB)
+PASS -- TEST 'control_iovr5_intel' [50:07, 00:25](583 MB)
+PASS -- TEST 'control_p8_intel' [49:02, 01:38](1561 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [48:54, 02:13](1563 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [47:54, 02:26](1573 MB)
+PASS -- TEST 'control_restart_p8_intel' [26:21, 01:57](751 MB)
+PASS -- TEST 'control_noqr_p8_intel' [47:54, 02:13](1557 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [22:31, 01:59](754 MB)
+PASS -- TEST 'control_decomp_p8_intel' [44:08, 02:04](1556 MB)
+PASS -- TEST 'control_2threads_p8_intel' [42:21, 01:52](1657 MB)
+PASS -- TEST 'control_p8_lndp_intel' [38:25, 01:06](1563 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [37:06, 02:25](1621 MB)
+PASS -- TEST 'control_p8_mynn_intel' [36:18, 02:00](1572 MB)
+PASS -- TEST 'merra2_thompson_intel' [33:31, 02:54](1578 MB)
+PASS -- TEST 'regional_control_intel' [33:25, 00:25](630 MB)
+PASS -- TEST 'regional_restart_intel' [27:21, 00:56](798 MB)
+PASS -- TEST 'regional_decomp_intel' [33:14, 00:58](628 MB)
+PASS -- TEST 'regional_2threads_intel' [31:23, 00:46](718 MB)
+PASS -- TEST 'regional_noquilt_intel' [30:34, 01:00](1164 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [30:30, 00:52](630 MB)
+PASS -- TEST 'regional_wofs_intel' [30:29, 00:27](1602 MB)
+
+PASS -- COMPILE 'ifi_intel' [09:22, 08:20]
+PASS -- TEST 'regional_ifi_control_intel' [55:07, 00:28](630 MB)
+PASS -- TEST 'regional_ifi_decomp_intel' [55:07, 00:25](628 MB)
+PASS -- TEST 'regional_ifi_2threads_intel' [55:08, 01:12](725 MB)
+
+PASS -- COMPILE 'rrfs_intel' [09:23, 09:05]
+PASS -- TEST 'rap_control_intel' [30:28, 02:41](970 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [30:17, 00:51](1146 MB)
+PASS -- TEST 'rap_decomp_intel' [29:14, 02:07](974 MB)
+PASS -- TEST 'rap_2threads_intel' [26:59, 02:10](1056 MB)
+PASS -- TEST 'rap_restart_intel' [04:40, 02:17](843 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [25:53, 02:22](972 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [23:57, 02:06](971 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [48:53, 02:29](843 MB)
+PASS -- TEST 'hrrr_control_intel' [23:55, 02:58](963 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [23:40, 02:52](966 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [23:35, 02:59](1045 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [51:39, 00:21](795 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [23:34, 02:41](965 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [23:24, 00:36](1929 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [23:06, 01:10](1919 MB)
+
+PASS -- COMPILE 'csawmg_intel' [09:23, 08:43]
+PASS -- TEST 'control_csawmg_intel' [22:59, 01:11](656 MB)
+
+PASS -- COMPILE 'wam_intel' [09:23, 08:23]
+PASS -- TEST 'control_wam_intel' [22:31, 00:26](331 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [12:26, 08:58]
+PASS -- TEST 'control_p8_faster_intel' [22:16, 02:06](1561 MB)
+PASS -- TEST 'regional_control_faster_intel' [21:28, 00:33](626 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [08:21, 04:24]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [55:05, 01:01](1557 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [21:10, 00:28](1559 MB)
+PASS -- TEST 'control_stochy_debug_intel' [20:26, 00:34](757 MB)
+PASS -- TEST 'control_lndp_debug_intel' [53:10, 00:16](757 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [18:07, 00:35](798 MB)
+PASS -- TEST 'control_ras_debug_intel' [17:37, 00:25](768 MB)
+PASS -- TEST 'control_diag_debug_intel' [17:29, 01:04](1619 MB)
+PASS -- TEST 'control_debug_p8_intel' [15:28, 01:15](1588 MB)
+PASS -- TEST 'regional_debug_intel' [15:14, 00:45](687 MB)
+PASS -- TEST 'rap_control_debug_intel' [04:26, 00:54](1145 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [03:36, 00:54](1140 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [55:40, 00:35](1140 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [54:58, 01:18](1145 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [54:39, 00:33](1145 MB)
+PASS -- TEST 'rap_diag_debug_intel' [42:00, 00:42](1230 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [53:33, 00:32](1145 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [53:19, 00:44](1145 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [52:30, 00:32](1149 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [51:44, 01:16](1145 MB)
+PASS -- TEST 'rap_noah_debug_intel' [51:39, 00:40](1148 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [50:59, 00:48](1143 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [50:46, 00:47](1142 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [36:51, 00:29](1136 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [50:03, 00:28](1144 MB)
+PASS -- TEST 'rap_flake_debug_intel' [49:21, 01:16](1145 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [49:04, 03:00](1151 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [08:20, 03:11]
+PASS -- TEST 'control_wam_debug_intel' [48:53, 00:40](369 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [13:27, 08:24]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [48:41, 01:20](1013 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [47:15, 02:26](851 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [44:36, 04:11](846 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [43:56, 02:12](908 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [42:24, 03:12](900 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [41:58, 02:28](847 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [32:46, 01:53](743 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [45:16, 01:07](730 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [16:29, 10:37]
+PASS -- TEST 'conus13km_control_intel' [41:58, 01:16](1055 MB)
+PASS -- TEST 'conus13km_2threads_intel' [28:24, 00:47](1036 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [26:27, 01:02](935 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [15:28, 08:32]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [41:54, 01:16](875 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [12:25, 03:17]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [41:50, 00:41](1020 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [41:45, 00:52](1023 MB)
+PASS -- TEST 'conus13km_debug_intel' [41:42, 00:32](1106 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [41:36, 00:32](783 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [41:15, 00:52](1088 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [40:56, 01:07](1195 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [10:23, 03:13]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [38:49, 00:33](1043 MB)
+
+PASS -- COMPILE 'hafsw_intel' [19:34, 09:48]
+PASS -- TEST 'hafs_regional_atm_intel' [38:15, 01:39](673 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [38:06, 01:14](1025 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [37:59, 01:50](714 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [37:39, 02:01](753 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [36:19, 02:07](910 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [36:16, 01:35](432 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [35:41, 01:28](456 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [35:22, 01:32](330 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [34:18, 02:29](400 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [33:54, 00:57](472 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [33:01, 01:06](470 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [32:38, 01:37](532 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [30:11, 00:57](365 MB)
+PASS -- TEST 'gnv1_nested_intel' [30:08, 01:11](730 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [12:26, 03:51]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [24:31, 01:00](632 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [20:35, 10:01]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [24:23, 01:05](577 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [23:55, 01:35](747 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [31:46, 09:53]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [23:18, 01:20](748 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [20:44, 09:31]
+PASS -- TEST 'hafs_regional_docn_intel' [21:30, 01:49](710 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [14:15, 01:54](695 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [10:42, 00:39](894 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [17:36, 08:42]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [23:38, 01:09](758 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [19:14, 01:04](750 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [06:13, 00:44](639 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [53:11, 00:55](642 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [51:52, 00:13](638 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [51:28, 01:09](759 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [50:31, 01:05](759 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [49:18, 00:24](638 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [49:18, 00:54](645 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [49:13, 00:52](623 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [48:32, 00:59](760 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [47:59, 01:02](2011 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [41:34, 01:00](2015 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [24:44, 08:42]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [37:14, 01:08](760 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [16:33, 01:04]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [31:53, 00:20](265 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [29:15, 01:05](413 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [24:42, 00:59](412 MB)
+
+PASS -- COMPILE 'atml_intel' [25:45, 10:08]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [28:46, 02:10](1602 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [26:17, 02:33](1602 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [17:32, 00:50](803 MB)
+
+PASS -- COMPILE 'atmw_intel' [30:51, 09:03]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [26:08, 02:14](1603 MB)
+
+PASS -- COMPILE 'atmaero_intel' [22:44, 08:58]
+PASS -- TEST 'atmaero_control_p8_intel' [14:04, 02:13](2915 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [14:04, 01:46](2974 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [14:04, 02:33](2984 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [11:31, 03:27]
+PASS -- TEST 'regional_atmaq_debug_intel' [18:55, 01:58](4511 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20240425 13:49:52
+Ending Date/Time: 20240425 17:25:30
+Total Time: 03h:36m:04s
+Compiles Completed: 35/35
+Tests Completed: 172/173
+Failed Tests:
+* TEST control_iovr4_intel: FAILED: RUN DID NOT COMPLETE
+-- LOG: /lfs/h1/emc/nems/noscrub/brian.curtis/git/jiandewang/ufs-weather-model/tests/logs/log_acorn/run_control_iovr4_intel.log
+
+NOTES:
+A file 'test_changes.list' was generated with list of all failed tests.
+You can use './rt.sh -c -b test_changes.list' to create baselines for the failed tests.
+If you are using this log as a pull request verification, please commit 'test_changes.list'.
+
+Result: FAILURE
+
+====END OF ACORN REGRESSION TESTING LOG====
+====START OF ACORN REGRESSION TESTING LOG====
+
+UFSWM hash used in testing:
+64df90f39f00b9682ca74b29f783bd0a37994a4a
+
+Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
+ be5d28fd1b60522e6fc98aefeead20e6aac3530b AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
  3d7067a523b8557058755289e4275f5f5c985daf CDEPS-interface/CDEPS (cdeps0.4.17-40-g3d7067a)
  c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 CICE-interface/CICE (CICE6.0.0-447-gc9e4679)
+ f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- cbd207b7e6376f71a58c8e79b477eac55b59f28b FV3 (remotes/origin/nesting-fixes)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
+ 011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
+ 9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
+-1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
+ 9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 7dc4d9ba48dea57f88f4f10091c8c2042105954e stochastic_physics (ufs-v2.0.0-210-g7dc4d9b)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -47,269 +340,22 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /lfs/h1/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_118167
+BASELINE DIRECTORY: /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_28522
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: GFS-DEV
-* (-e) - USE ECFLOW
+* (-b) - NEW BASELINES FROM FILE: test_changes.list
 
-PASS -- COMPILE 's2swa_32bit_intel' [10:34, 10:14]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [00:08, 01:47](3047 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [16:44, 16:12]
-PASS -- TEST 'cpld_control_gfsv17_intel' [53:08, 02:03](1656 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [20:38, 01:21](1781 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [17:06, 01:34](905 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [52:39, 01:46](1626 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [04:20, 03:48]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [06:23, 01:08](1676 MB)
-
-PASS -- COMPILE 's2swa_intel' [10:35, 10:17]
-PASS -- TEST 'cpld_control_p8_intel' [00:07, 01:17](3077 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [00:07, 01:50](3072 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [36:57, 01:43](3132 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [00:07, 01:00](3099 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [42:22, 01:46](3150 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [00:07, 01:34](3385 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [00:07, 01:22](3072 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [00:08, 01:27](2997 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [00:07, 01:17](3076 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [00:07, 00:54](3039 MB)
-
-PASS -- COMPILE 's2sw_intel' [11:36, 10:52]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [59:05, 00:57](1647 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [59:05, 01:38](1698 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [09:32, 09:10]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [01:10, 01:01](1699 MB)
-
-PASS -- COMPILE 's2s_intel' [09:32, 09:14]
-PASS -- TEST 'cpld_control_c48_intel' [01:09, 00:44](2675 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [15:44, 15:20]
-PASS -- TEST 'cpld_control_p8_faster_intel' [54:57, 01:02](3073 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [16:46, 15:44]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [51:09, 00:38](1669 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [21:20, 00:33](971 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [16:54, 01:26](1636 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [04:19, 03:38]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [06:24, 00:52](1693 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [09:29, 09:12]
-PASS -- TEST 'control_flake_intel' [56:54, 01:12](635 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [56:54, 01:11](584 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [56:54, 01:06](592 MB)
-PASS -- TEST 'control_latlon_intel' [56:54, 00:55](586 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [56:54, 01:17](585 MB)
-PASS -- TEST 'control_c48_intel' [56:53, 00:44](737 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [56:53, 00:51](741 MB)
-PASS -- TEST 'control_c192_intel' [56:54, 01:14](708 MB)
-PASS -- TEST 'control_c384_intel' [56:58, 01:33](1010 MB)
-PASS -- TEST 'control_c384gdas_intel' [56:58, 02:15](1159 MB)
-PASS -- TEST 'control_stochy_intel' [56:54, 00:17](597 MB)
-PASS -- TEST 'control_stochy_restart_intel' [39:56, 00:21](394 MB)
-PASS -- TEST 'control_lndp_intel' [56:54, 00:33](589 MB)
-PASS -- TEST 'control_iovr4_intel' [51:09, 00:48](587 MB)
-PASS -- TEST 'control_iovr5_intel' [50:08, 00:15](587 MB)
-PASS -- TEST 'control_p8_intel' [48:28, 01:44](1561 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [44:30, 01:03](1571 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [43:29, 01:54](1564 MB)
-PASS -- TEST 'control_restart_p8_intel' [31:46, 00:54](752 MB)
-PASS -- TEST 'control_noqr_p8_intel' [41:05, 01:17](1551 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [14:14, 01:25](758 MB)
-PASS -- TEST 'control_decomp_p8_intel' [41:03, 01:35](1561 MB)
-PASS -- TEST 'control_2threads_p8_intel' [40:15, 00:45](1652 MB)
-PASS -- TEST 'control_p8_lndp_intel' [39:35, 01:07](1561 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [39:30, 01:03](1622 MB)
-PASS -- TEST 'control_p8_mynn_intel' [38:02, 01:16](1576 MB)
-PASS -- TEST 'merra2_thompson_intel' [37:51, 01:08](1568 MB)
-PASS -- TEST 'regional_control_intel' [37:50, 00:20](633 MB)
-PASS -- TEST 'regional_restart_intel' [27:53, 00:17](801 MB)
-PASS -- TEST 'regional_decomp_intel' [37:47, 01:02](635 MB)
-PASS -- TEST 'regional_2threads_intel' [37:41, 00:19](726 MB)
-PASS -- TEST 'regional_noquilt_intel' [36:48, 00:58](1165 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [36:15, 00:47](631 MB)
-PASS -- TEST 'regional_wofs_intel' [36:06, 01:04](1603 MB)
-
-PASS -- COMPILE 'ifi_intel' [08:27, 08:00]
-PASS -- TEST 'regional_ifi_control_intel' [57:53, 00:24](631 MB)
-PASS -- TEST 'regional_ifi_decomp_intel' [57:53, 00:45](630 MB)
-PASS -- TEST 'regional_ifi_2threads_intel' [57:54, 01:12](721 MB)
-
-PASS -- COMPILE 'rrfs_intel' [09:30, 08:42]
-PASS -- TEST 'rap_control_intel' [34:53, 01:29](976 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [34:17, 01:14](1150 MB)
-PASS -- TEST 'rap_decomp_intel' [34:15, 01:27](977 MB)
-PASS -- TEST 'rap_2threads_intel' [33:42, 01:38](1060 MB)
-PASS -- TEST 'rap_restart_intel' [03:39, 00:58](843 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [31:33, 01:30](969 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [30:56, 00:43](970 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [00:26, 01:17](842 MB)
-PASS -- TEST 'hrrr_control_intel' [30:52, 01:32](963 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [29:55, 00:49](967 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [29:54, 01:42](1050 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [02:47, 00:27](799 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [28:37, 00:58](968 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [28:24, 01:21](1932 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [27:26, 00:48](1917 MB)
-
-PASS -- COMPILE 'csawmg_intel' [09:30, 08:22]
-PASS -- TEST 'control_csawmg_intel' [26:52, 00:57](664 MB)
-PASS -- TEST 'control_csawmgt_intel' [25:52, 01:01](657 MB)
-
-PASS -- COMPILE 'wam_intel' [08:27, 08:01]
-PASS -- TEST 'control_wam_intel' [25:16, 00:30](338 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [09:31, 08:43]
-PASS -- TEST 'control_p8_faster_intel' [24:14, 00:52](1560 MB)
-PASS -- TEST 'regional_control_faster_intel' [22:09, 00:48](627 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [10:32, 03:55]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [14:27, 00:58](758 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [12:20, 00:42](758 MB)
-PASS -- TEST 'control_stochy_debug_intel' [11:33, 00:38](766 MB)
-PASS -- TEST 'control_lndp_debug_intel' [07:51, 00:41](764 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [07:27, 00:31](801 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [07:11, 00:44](804 MB)
-PASS -- TEST 'control_ras_debug_intel' [06:32, 00:28](778 MB)
-PASS -- TEST 'control_diag_debug_intel' [05:52, 00:56](824 MB)
-PASS -- TEST 'control_debug_p8_intel' [05:44, 01:06](1590 MB)
-PASS -- TEST 'regional_debug_intel' [03:38, 00:27](672 MB)
-PASS -- TEST 'rap_control_debug_intel' [03:27, 01:13](1146 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [03:13, 01:04](1137 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [02:12, 01:07](1144 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [01:22, 01:22](1142 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [00:04, 00:51](1146 MB)
-PASS -- TEST 'rap_diag_debug_intel' [59:42, 00:41](1230 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [59:37, 00:45](1147 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [58:35, 00:27](1144 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [58:24, 00:40](1149 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [58:20, 00:41](1146 MB)
-PASS -- TEST 'rap_noah_debug_intel' [58:19, 00:48](1144 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [57:49, 00:53](1144 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [57:14, 01:02](1148 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [57:08, 00:44](1136 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [56:33, 01:07](1148 MB)
-PASS -- TEST 'rap_flake_debug_intel' [55:56, 00:32](1142 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [55:52, 01:57](1153 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [09:28, 02:51]
-PASS -- TEST 'control_wam_debug_intel' [55:31, 00:27](373 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [27:03, 08:13]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [55:23, 01:02](1019 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [55:14, 01:26](855 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [55:12, 01:37](849 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [55:08, 01:10](909 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [54:54, 01:34](902 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [54:48, 01:25](850 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [43:09, 01:24](749 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [45:31, 00:25](729 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [17:59, 10:14]
-PASS -- TEST 'conus13km_control_intel' [37:00, 00:44](1057 MB)
-PASS -- TEST 'conus13km_2threads_intel' [30:01, 00:53](1042 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [29:59, 01:08](942 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [14:46, 08:12]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [39:12, 00:35](877 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [10:43, 03:01]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [43:14, 01:07](1027 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [43:14, 00:13](1025 MB)
-PASS -- TEST 'conus13km_debug_intel' [43:14, 00:47](1119 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [43:14, 00:39](793 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [43:15, 00:43](1089 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [43:14, 00:36](1184 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [08:32, 03:00]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [43:08, 01:09](1047 MB)
-
-PASS -- COMPILE 'hafsw_intel' [14:51, 09:23]
-PASS -- TEST 'hafs_regional_atm_intel' [36:52, 01:21](677 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [36:52, 00:55](1028 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [36:50, 02:32](724 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [36:50, 01:40](764 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [36:51, 01:15](784 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [36:50, 01:39](443 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [36:51, 02:05](467 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [36:51, 00:54](342 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [36:54, 02:33](407 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [36:50, 00:47](475 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [36:50, 01:05](475 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [36:52, 00:51](544 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [36:51, 00:24](371 MB)
-PASS -- TEST 'gnv1_nested_intel' [36:51, 01:29](737 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [08:38, 03:16]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [43:05, 01:19](575 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [13:50, 09:39]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [36:43, 00:49](592 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [36:37, 01:15](752 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [11:45, 09:19]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [36:51, 01:30](753 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [11:46, 08:55]
-PASS -- TEST 'hafs_regional_docn_intel' [35:19, 01:39](712 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [35:18, 01:14](699 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [33:12, 01:09](894 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [53:02, 09:02]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [36:47, 00:57](759 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [22:00, 00:14](752 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [36:47, 00:15](641 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [36:47, 01:08](640 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [32:30, 00:16](639 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [26:59, 00:54](761 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [26:54, 00:19](759 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [26:34, 00:57](639 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [24:30, 01:19](647 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [23:25, 00:42](631 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [23:02, 00:12](747 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [22:53, 00:51](2020 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [21:43, 00:41](2022 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [09:28, 08:45]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [21:41, 00:36](749 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [01:12, 01:01]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [41:56, 01:07](274 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [41:56, 01:13](411 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [20:16, 01:07](412 MB)
-
-PASS -- COMPILE 'atml_intel' [10:33, 10:15]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [19:13, 01:28](1605 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [18:51, 01:35](1607 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [07:14, 00:19](809 MB)
-
-PASS -- COMPILE 'atmw_intel' [11:34, 08:50]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [18:41, 01:39](1610 MB)
-
-PASS -- COMPILE 'atmwm_intel' [10:30, 08:43]
-PASS -- TEST 'control_atmwav_intel' [18:23, 00:59](603 MB)
-
-PASS -- COMPILE 'atmaero_intel' [09:28, 08:31]
-PASS -- TEST 'atmaero_control_p8_intel' [17:44, 01:03](2916 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [17:30, 01:35](2977 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [16:22, 01:15](2989 MB)
-
-PASS -- COMPILE 'atmaq_intel' [09:29, 08:21]
-
-PASS -- COMPILE 'atmaq_debug_intel' [03:17, 03:01]
-PASS -- TEST 'regional_atmaq_debug_intel' [15:11, 00:56](4493 MB)
+PASS -- COMPILE 'atm_dyn32_intel' [10:23, 09:44]
+PASS -- TEST 'control_iovr4_intel' [21:34, 00:52](583 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240411 18:49:04
-Ending Date/Time: 20240411 21:11:18
-Total Time: 02h:22m:34s
-Compiles Completed: 37/37
-Tests Completed: 176/176
+Starting Date/Time: 20240425 17:28:05
+Ending Date/Time: 20240425 17:42:03
+Total Time: 00h:14m:07s
+Compiles Completed: 1/1
+Tests Completed: 1/1
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_derecho.log b/tests/logs/RegressionTests_derecho.log
index eca5c613b4..614b7b6b15 100644
--- a/tests/logs/RegressionTests_derecho.log
+++ b/tests/logs/RegressionTests_derecho.log
@@ -1,7 +1,7 @@
 ====START OF DERECHO REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-d43ccd1b047697197e01c095515d268a6e53270f
+fe4bb76565de0a5f3261b276fa392d65cb046e96
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,22 +11,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,278 +35,269 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT//NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /glade/derecho/scratch/zshrader/FV3_RT/rt_119149
+BASELINE DIRECTORY: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT//NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /glade/derecho/scratch/zshrader/FV3_RT/rt_68317
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: nral0032
 * (-l) - USE CONFIG FILE: rt.conf
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [21:15, 20:07]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:54, 04:59](3078 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [22:17, 20:59]
-PASS -- TEST 'cpld_control_gfsv17_intel' [17:42, 13:53](1692 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [19:45, 15:16](1828 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [11:27, 07:26](958 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [20:05, 15:48](1662 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [11:13, 09:32]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [24:54, 21:26](1711 MB)
-
-PASS -- COMPILE 's2swa_intel' [21:15, 19:40]
-PASS -- TEST 'cpld_control_p8_intel' [10:53, 05:44](3091 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [10:53, 05:41](3092 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [07:23, 03:19](3152 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [10:18, 05:41](3129 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [07:11, 03:22](3181 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [10:04, 05:36](3095 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [08:22, 04:36](3398 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [10:15, 05:38](3101 MB)
-PASS -- TEST 'cpld_control_c192_p8_intel' [17:03, 08:52](3636 MB)
-PASS -- TEST 'cpld_restart_c192_p8_intel' [18:16, 06:04](3614 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [41:36, 10:07](4343 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [44:57, 07:35](4648 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [09:53, 05:20](3067 MB)
-
-PASS -- COMPILE 's2sw_intel' [21:16, 19:11]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [07:59, 04:16](1681 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [08:17, 04:15](1736 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [10:14, 09:16]
-FAILED: RUN DID NOT COMPLETE -- TEST 'cpld_debug_p8_intel' [, ]( MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [10:14, 08:54]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [08:41, 05:15](1708 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [15:15, 14:24]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [07:54, 04:20](1735 MB)
-
-PASS -- COMPILE 's2s_intel' [15:15, 14:25]
-PASS -- TEST 'cpld_control_c48_intel' [08:42, 06:37](2673 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [24:17, 23:07]
-PASS -- TEST 'cpld_control_p8_faster_intel' [09:14, 05:31](3101 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [20:15, 19:32]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [18:03, 14:04](1701 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [11:08, 07:27](1016 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [19:13, 16:02](1669 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [10:19, 08:56]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [26:23, 23:00](1714 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [14:17, 12:37]
-PASS -- TEST 'control_flake_intel' [05:10, 03:26](669 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [03:58, 02:05](621 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [04:24, 02:11](627 MB)
-PASS -- TEST 'control_latlon_intel' [04:00, 02:05](619 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [04:01, 02:08](622 MB)
-PASS -- TEST 'control_c48_intel' [06:53, 05:18](734 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [06:52, 05:19](737 MB)
-PASS -- TEST 'control_c192_intel' [11:08, 07:57](738 MB)
-PASS -- TEST 'control_c384_intel' [16:40, 08:20](1062 MB)
-PASS -- TEST 'control_c384gdas_intel' [21:25, 07:27](1196 MB)
-PASS -- TEST 'control_stochy_intel' [03:00, 01:26](626 MB)
-PASS -- TEST 'control_stochy_restart_intel' [02:56, 00:53](440 MB)
-PASS -- TEST 'control_lndp_intel' [03:01, 01:23](629 MB)
-PASS -- TEST 'control_iovr4_intel' [04:21, 02:08](624 MB)
-PASS -- TEST 'control_iovr5_intel' [04:19, 02:07](622 MB)
-PASS -- TEST 'control_p8_intel' [05:07, 02:31](1593 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [05:21, 02:29](1604 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [05:33, 02:28](1601 MB)
-PASS -- TEST 'control_restart_p8_intel' [03:35, 01:27](802 MB)
-PASS -- TEST 'control_noqr_p8_intel' [05:29, 02:31](1595 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [03:34, 01:24](803 MB)
-PASS -- TEST 'control_decomp_p8_intel' [05:25, 02:35](1601 MB)
-PASS -- TEST 'control_p8_lndp_intel' [07:20, 04:23](1604 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [06:22, 03:20](1654 MB)
-PASS -- TEST 'control_p8_mynn_intel' [05:28, 02:33](1605 MB)
-PASS -- TEST 'merra2_thompson_intel' [07:25, 03:02](1610 MB)
-PASS -- TEST 'regional_control_intel' [06:33, 04:33](632 MB)
-PASS -- TEST 'regional_restart_intel' [04:14, 02:36](802 MB)
-PASS -- TEST 'regional_decomp_intel' [07:11, 04:46](631 MB)
-PASS -- TEST 'regional_noquilt_intel' [08:09, 04:30](1163 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [08:01, 04:32](625 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [08:13, 04:32](628 MB)
-PASS -- TEST 'regional_wofs_intel' [09:07, 05:38](1599 MB)
-
-PASS -- COMPILE 'rrfs_intel' [12:13, 11:15]
-PASS -- TEST 'rap_control_intel' [09:24, 06:06](1004 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [10:07, 03:45](1193 MB)
-PASS -- TEST 'rap_decomp_intel' [09:20, 06:23](1005 MB)
-PASS -- TEST 'rap_restart_intel' [05:36, 03:18](879 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [08:53, 06:06](1005 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [08:36, 06:23](1007 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [06:36, 04:35](882 MB)
-PASS -- TEST 'hrrr_control_intel' [05:59, 03:15](1000 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [05:52, 03:20](1007 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [06:59, 02:49](1088 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [04:14, 01:46](834 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [08:35, 06:02](999 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [09:00, 07:24](1961 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [08:58, 07:08](1952 MB)
-
-PASS -- COMPILE 'csawmg_intel' [11:13, 10:20]
-PASS -- TEST 'control_csawmg_intel' [08:30, 05:51](695 MB)
-PASS -- TEST 'control_csawmgt_intel' [08:24, 05:46](692 MB)
-PASS -- TEST 'control_ras_intel' [04:48, 02:54](658 MB)
-
-PASS -- COMPILE 'wam_intel' [10:13, 09:16]
-PASS -- TEST 'control_wam_intel' [03:40, 01:54](380 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [14:24, 12:53]
-PASS -- TEST 'control_p8_faster_intel' [05:12, 02:24](1599 MB)
-PASS -- TEST 'regional_control_faster_intel' [06:30, 04:17](627 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [09:23, 08:42]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [04:39, 02:35](796 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [04:39, 02:33](792 MB)
-PASS -- TEST 'control_stochy_debug_intel' [04:41, 02:51](797 MB)
-PASS -- TEST 'control_lndp_debug_intel' [03:49, 02:36](797 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [06:43, 04:01](842 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [06:34, 03:56](838 MB)
-PASS -- TEST 'control_ras_debug_intel' [03:49, 02:39](807 MB)
-PASS -- TEST 'control_diag_debug_intel' [06:22, 02:47](855 MB)
-PASS -- TEST 'control_debug_p8_intel' [04:27, 02:40](1627 MB)
-PASS -- TEST 'regional_debug_intel' [18:18, 16:16](669 MB)
-PASS -- TEST 'rap_control_debug_intel' [06:49, 04:47](1181 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [06:43, 04:38](1180 MB)
-FAILED: RUN DID NOT COMPLETE -- TEST 'hrrr_gf_debug_intel' [, ]( MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [05:44, 04:38](1181 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:39, 04:46](1183 MB)
-PASS -- TEST 'rap_diag_debug_intel' [09:22, 05:00](1270 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [06:51, 04:52](1183 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [06:48, 04:52](1183 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [06:47, 04:42](1184 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:40, 04:40](1181 MB)
-PASS -- TEST 'rap_noah_debug_intel' [05:44, 04:36](1181 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [06:51, 04:49](1182 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [09:45, 07:43](1181 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [06:50, 04:36](1176 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [06:52, 05:24](1186 MB)
-PASS -- TEST 'rap_flake_debug_intel' [06:49, 04:42](1183 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [10:36, 08:08](1183 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [06:38, 05:30]
-PASS -- TEST 'control_wam_debug_intel' [05:38, 04:35](421 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [11:18, 09:54]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [08:56, 03:40](1059 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [07:33, 05:15](881 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [05:45, 02:49](886 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:34, 02:55](888 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [06:27, 03:53](796 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [03:03, 01:32](777 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [13:19, 12:01]
-PASS -- TEST 'conus13km_control_intel' [07:02, 01:56](1088 MB)
-PASS -- TEST 'conus13km_2threads_intel' [05:00, 01:01](1087 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [04:57, 01:09](975 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [11:19, 10:02]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [06:29, 03:42](912 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [06:17, 05:49]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:54, 04:35](1056 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [05:49, 04:33](1055 MB)
-PASS -- TEST 'conus13km_debug_intel' [18:36, 13:48](1135 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [17:08, 13:38](819 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [16:50, 13:31](1203 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [06:16, 05:33]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [05:50, 04:36](1085 MB)
-
-PASS -- COMPILE 'hafsw_intel' [17:23, 15:59]
-PASS -- TEST 'hafs_regional_atm_intel' [08:08, 04:40](719 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [07:58, 05:09](1065 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [10:01, 06:32](782 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [14:49, 10:58](795 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [16:28, 12:08](810 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [07:00, 04:42](478 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [08:44, 05:50](496 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [04:17, 02:24](392 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [11:22, 06:24](452 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [05:11, 03:22](511 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [06:02, 03:12](514 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [06:39, 03:53](590 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:41, 01:18](427 MB)
-PASS -- TEST 'gnv1_nested_intel' [05:53, 03:27](790 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [07:17, 06:42]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [14:45, 12:06](614 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [23:19, 19:45]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [10:05, 07:12](636 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [10:36, 07:16](693 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [17:19, 16:10]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [08:10, 05:21](683 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [15:14, 14:17]
-PASS -- TEST 'hafs_regional_docn_intel' [09:00, 05:38](756 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [09:11, 05:40](741 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [19:43, 16:14](896 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [09:17, 07:41]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:45, 02:31](760 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [03:02, 01:36](750 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:49, 02:24](642 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:49, 02:27](648 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:44, 02:27](649 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:45, 02:30](761 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [03:45, 02:32](760 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:44, 02:23](644 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [14:44, 05:47](690 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [14:55, 05:46](675 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:27, 02:28](761 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [06:05, 03:59](2018 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [06:06, 04:01](2018 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [06:16, 04:57]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:56, 05:06](746 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [08:19, 07:42]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:42, 02:31](760 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [03:17, 02:24]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [02:49, 01:15](314 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [02:36, 01:08](452 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [02:38, 00:47](450 MB)
-
-PASS -- COMPILE 'atml_intel' [14:18, 13:08]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [10:58, 07:38](1632 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [10:51, 07:42](1627 MB)
-FAILED: RUN DID NOT COMPLETE -- TEST 'control_restart_p8_atmlnd_intel' [, ]( MB)
-
-PASS -- COMPILE 'atmw_intel' [14:18, 12:51]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:44, 01:34](1631 MB)
-
-PASS -- COMPILE 'atmwm_intel' [14:18, 12:59]
-PASS -- TEST 'control_atmwav_intel' [03:28, 01:29](638 MB)
-
-PASS -- COMPILE 'atmaero_intel' [12:20, 11:11]
-PASS -- TEST 'atmaero_control_p8_intel' [07:28, 03:48](2946 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [07:31, 04:19](2997 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [06:57, 04:32](3015 MB)
-
-PASS -- COMPILE 'atmaq_debug_intel' [07:12, 06:27]
-PASS -- TEST 'regional_atmaq_debug_intel' [33:27, 21:57](4534 MB)
+PASS -- COMPILE 's2swa_32bit_intel' [20:19, 19:02]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:58, 04:58](3073 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [21:16, 20:24]
+PASS -- TEST 'cpld_control_gfsv17_intel' [16:09, 13:47](1689 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [18:48, 15:04](1824 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [10:33, 07:07](959 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [18:06, 15:46](1665 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [10:16, 08:59]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [23:47, 21:22](1706 MB)
+
+PASS -- COMPILE 's2swa_intel' [20:17, 19:06]
+PASS -- TEST 'cpld_control_p8_intel' [09:05, 05:38](3091 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [09:14, 05:33](3095 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [06:50, 03:17](3150 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [09:05, 05:33](3125 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [06:54, 03:20](3180 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [08:54, 05:35](3090 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [07:27, 04:37](3385 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [09:11, 05:38](3101 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [14:09, 08:43](3634 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [14:48, 05:50](3616 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [27:34, 09:39](4341 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [24:41, 07:03](4648 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [08:35, 05:12](3064 MB)
+
+PASS -- COMPILE 's2sw_intel' [19:18, 18:31]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [06:46, 04:09](1685 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [06:59, 04:12](1727 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [10:15, 09:01]
+PASS -- TEST 'cpld_debug_p8_intel' [09:56, 07:36](3151 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [09:15, 08:28]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [07:21, 05:10](1710 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [15:17, 14:05]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [07:53, 04:12](1728 MB)
+
+PASS -- COMPILE 's2s_intel' [15:17, 14:02]
+PASS -- TEST 'cpld_control_c48_intel' [08:14, 06:35](2670 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [23:20, 22:47]
+PASS -- TEST 'cpld_control_p8_faster_intel' [08:27, 05:28](3102 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [20:19, 19:28]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [16:55, 14:03](1708 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [10:31, 07:16](1019 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [18:56, 16:00](1666 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [09:17, 08:32]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [25:46, 22:54](1718 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [13:18, 12:20]
+PASS -- TEST 'control_flake_intel' [04:52, 03:23](667 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [04:30, 02:25](1567 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [04:54, 02:27](1572 MB)
+PASS -- TEST 'control_latlon_intel' [04:31, 02:22](1572 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [04:34, 02:24](1568 MB)
+PASS -- TEST 'control_c48_intel' [08:28, 06:13](1616 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [06:39, 05:17](734 MB)
+PASS -- TEST 'control_c192_intel' [11:09, 08:39](1690 MB)
+PASS -- TEST 'control_c384_intel' [16:38, 08:56](2011 MB)
+PASS -- TEST 'control_c384gdas_intel' [17:05, 07:23](1199 MB)
+PASS -- TEST 'control_stochy_intel' [02:43, 01:25](627 MB)
+PASS -- TEST 'control_stochy_restart_intel' [02:45, 00:52](443 MB)
+PASS -- TEST 'control_lndp_intel' [02:42, 01:22](626 MB)
+PASS -- TEST 'control_iovr4_intel' [03:42, 02:05](625 MB)
+PASS -- TEST 'control_iovr5_intel' [03:42, 02:06](624 MB)
+PASS -- TEST 'control_p8_intel' [04:27, 02:30](1601 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [04:28, 02:30](1598 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [04:29, 02:28](1602 MB)
+PASS -- TEST 'control_restart_p8_intel' [03:24, 01:24](804 MB)
+PASS -- TEST 'control_noqr_p8_intel' [04:26, 02:30](1585 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [03:29, 01:23](805 MB)
+PASS -- TEST 'control_decomp_p8_intel' [04:40, 02:32](1591 MB)
+PASS -- TEST 'control_p8_lndp_intel' [06:28, 04:21](1605 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [05:45, 03:17](1659 MB)
+PASS -- TEST 'control_p8_mynn_intel' [04:46, 02:30](1607 MB)
+PASS -- TEST 'merra2_thompson_intel' [04:44, 02:48](1603 MB)
+PASS -- TEST 'regional_control_intel' [06:07, 04:31](632 MB)
+PASS -- TEST 'regional_restart_intel' [04:16, 02:33](800 MB)
+PASS -- TEST 'regional_decomp_intel' [06:12, 04:43](629 MB)
+PASS -- TEST 'regional_noquilt_intel' [06:03, 04:25](1159 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [06:04, 04:27](629 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [06:00, 04:30](627 MB)
+PASS -- TEST 'regional_wofs_intel' [07:07, 05:35](1606 MB)
+
+PASS -- COMPILE 'rrfs_intel' [12:14, 10:56]
+PASS -- TEST 'rap_control_intel' [08:21, 06:06](1008 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [07:00, 03:41](1191 MB)
+PASS -- TEST 'rap_decomp_intel' [08:22, 06:23](1006 MB)
+PASS -- TEST 'rap_restart_intel' [05:16, 03:11](882 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [08:21, 06:04](1007 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [08:15, 06:23](1003 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [06:12, 04:35](881 MB)
+PASS -- TEST 'hrrr_control_intel' [05:14, 03:13](998 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [05:19, 03:18](1006 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [05:17, 02:49](1088 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [02:53, 01:44](832 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [08:05, 05:57](1001 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [08:39, 07:21](1956 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [08:40, 07:10](1950 MB)
+
+PASS -- COMPILE 'csawmg_intel' [11:13, 10:02]
+PASS -- TEST 'control_csawmg_intel' [08:12, 05:48](695 MB)
+PASS -- TEST 'control_ras_intel' [04:36, 02:51](660 MB)
+
+PASS -- COMPILE 'wam_intel' [10:13, 09:21]
+PASS -- TEST 'control_wam_intel' [03:34, 01:53](382 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [13:20, 12:20]
+PASS -- TEST 'control_p8_faster_intel' [04:52, 02:26](1606 MB)
+PASS -- TEST 'regional_control_faster_intel' [06:16, 04:17](629 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [09:17, 08:31]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [04:09, 02:29](1595 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [04:23, 02:28](1600 MB)
+PASS -- TEST 'control_stochy_debug_intel' [04:32, 02:50](800 MB)
+PASS -- TEST 'control_lndp_debug_intel' [03:46, 02:33](798 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [06:06, 03:57](840 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:33, 02:40](806 MB)
+PASS -- TEST 'control_diag_debug_intel' [04:38, 02:32](1666 MB)
+PASS -- TEST 'control_debug_p8_intel' [04:10, 02:35](1628 MB)
+PASS -- TEST 'regional_debug_intel' [17:13, 15:49](665 MB)
+PASS -- TEST 'rap_control_debug_intel' [05:38, 04:39](1180 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [05:36, 04:33](1178 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [05:32, 04:35](1182 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [06:38, 04:39](1181 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:34, 04:43](1181 MB)
+PASS -- TEST 'rap_diag_debug_intel' [08:30, 04:51](1266 MB)
+FAILED: RUN DID NOT COMPLETE -- TEST 'rap_cires_ugwp_debug_intel' [, ]( MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [05:28, 04:44](1182 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [06:37, 04:42](1182 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:35, 04:48](1184 MB)
+PASS -- TEST 'rap_noah_debug_intel' [05:34, 04:30](1184 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [06:37, 04:48](1181 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [08:36, 07:27](1182 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [05:41, 04:34](1178 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [06:44, 05:30](1183 MB)
+PASS -- TEST 'rap_flake_debug_intel' [05:37, 04:37](1180 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [10:03, 07:53](1187 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [06:12, 05:11]
+PASS -- TEST 'control_wam_debug_intel' [05:24, 04:36](418 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [10:17, 09:30]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [06:45, 03:30](1059 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [07:02, 05:07](884 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [04:15, 02:45](881 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:05, 02:53](881 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [06:06, 03:52](796 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:47, 01:32](777 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [12:19, 11:44]
+PASS -- TEST 'conus13km_control_intel' [04:41, 01:52](1086 MB)
+PASS -- TEST 'conus13km_2threads_intel' [03:31, 00:58](1086 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [03:37, 01:07](972 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [11:13, 09:48]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [05:07, 03:36](906 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [07:11, 06:04]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:35, 04:29](1058 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [05:30, 04:24](1058 MB)
+PASS -- TEST 'conus13km_debug_intel' [16:03, 13:24](1134 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [16:02, 13:34](818 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [15:50, 13:26](1203 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [07:19, 05:58]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [05:34, 04:38](1081 MB)
+
+PASS -- COMPILE 'hafsw_intel' [17:21, 16:01]
+PASS -- TEST 'hafs_regional_atm_intel' [06:57, 04:34](720 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [07:02, 05:02](1068 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [09:01, 06:24](774 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [13:48, 10:49](798 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [15:23, 12:01](819 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [06:26, 04:40](479 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [07:47, 05:46](493 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [04:08, 02:21](393 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [09:59, 06:13](458 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [05:08, 03:15](513 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [05:16, 03:02](512 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [05:37, 03:45](587 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:37, 01:16](427 MB)
+PASS -- TEST 'gnv1_nested_intel' [05:13, 03:22](787 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [08:19, 07:08]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [14:15, 11:58](612 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [20:20, 19:52]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [09:38, 07:10](631 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [09:25, 07:09](688 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [17:19, 16:44]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [07:46, 05:17](679 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [15:19, 14:27]
+PASS -- TEST 'hafs_regional_docn_intel' [07:49, 05:33](755 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [07:34, 05:33](737 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [18:21, 16:09](894 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [08:17, 07:52]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:28, 02:29](760 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:29, 01:32](749 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:30, 02:20](644 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:24, 02:24](643 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [03:25, 02:24](648 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:30, 02:28](761 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [03:31, 02:29](761 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:25, 02:23](638 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [08:17, 05:39](692 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [08:56, 05:39](673 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:18, 02:28](762 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:35, 03:54](2016 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [05:28, 03:54](2017 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [06:18, 05:11]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:29, 05:03](746 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [08:22, 07:48]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:36, 02:32](759 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [03:11, 02:20]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [02:36, 01:11](310 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [02:34, 01:05](458 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:37, 00:41](450 MB)
+
+PASS -- COMPILE 'atml_intel' [14:14, 13:00]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [09:35, 06:59](1628 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [08:56, 06:22](1636 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [05:00, 03:31](855 MB)
+
+PASS -- COMPILE 'atmw_intel' [13:20, 12:36]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:26, 01:32](1641 MB)
+
+PASS -- COMPILE 'atmaero_intel' [12:13, 11:05]
+PASS -- TEST 'atmaero_control_p8_intel' [05:38, 03:38](2951 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [06:38, 04:15](3000 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [06:10, 04:19](3012 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [07:20, 06:30]
+PASS -- TEST 'regional_atmaq_debug_intel' [25:29, 22:05](4531 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240416 14:22:27
-Ending Date/Time: 20240416 16:12:18
-Total Time: 01h:50m:38s
-Compiles Completed: 38/38
-Tests Completed: 172/175
+Starting Date/Time: 20240424 06:22:13
+Ending Date/Time: 20240424 07:49:24
+Total Time: 01h:27m:53s
+Compiles Completed: 37/37
+Tests Completed: 171/172
 Failed Tests:
-* TEST cpld_debug_p8_intel: FAILED: RUN DID NOT COMPLETE
--- LOG: /glade/work/zshrader/ufs-weather-model/tests/logs/log_derecho/run_cpld_debug_p8_intel.log
-* TEST hrrr_gf_debug_intel: FAILED: RUN DID NOT COMPLETE
--- LOG: /glade/work/zshrader/ufs-weather-model/tests/logs/log_derecho/run_hrrr_gf_debug_intel.log
-* TEST control_restart_p8_atmlnd_intel: FAILED: RUN DID NOT COMPLETE
--- LOG: /glade/work/zshrader/ufs-weather-model/tests/logs/log_derecho/run_control_restart_p8_atmlnd_intel.log
+* TEST rap_cires_ugwp_debug_intel: FAILED: RUN DID NOT COMPLETE
+-- LOG: /glade/work/zshrader/rt-2241/tests/logs/log_derecho/run_rap_cires_ugwp_debug_intel.log
 
 NOTES:
 A file 'test_changes.list' was generated with list of all failed tests.
@@ -319,7 +310,7 @@ Result: FAILURE
 ====START OF DERECHO REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-d43ccd1b047697197e01c095515d268a6e53270f
+fe4bb76565de0a5f3261b276fa392d65cb046e96
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -329,22 +320,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -353,30 +344,22 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT//NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /glade/derecho/scratch/zshrader/FV3_RT/rt_55240
+BASELINE DIRECTORY: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT//NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /glade/derecho/scratch/zshrader/FV3_RT/rt_96038
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: nral0032
 * (-l) - USE CONFIG FILE: rt.conf
-* (-e) - USE ECFLOW
-
-PASS -- COMPILE 's2swa_debug_intel' [10:18, 09:13]
-PASS -- TEST 'cpld_debug_p8_intel' [11:29, 07:46](3155 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [09:18, 08:25]
-PASS -- TEST 'hrrr_gf_debug_intel' [05:42, 04:38](1183 MB)
 
-PASS -- COMPILE 'atml_intel' [14:19, 12:54]
-PASS -- TEST 'control_p8_atmlnd_intel' [10:09, 06:20](1641 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [07:02, 03:54](850 MB)
+PASS -- COMPILE 'atm_debug_dyn32_intel' [09:12, 08:38]
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:33, 04:42](1183 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240416 16:43:55
-Ending Date/Time: 20240416 17:16:53
-Total Time: 00h:33m:08s
-Compiles Completed: 3/3
-Tests Completed: 4/4
+Starting Date/Time: 20240424 08:20:30
+Ending Date/Time: 20240424 08:35:15
+Total Time: 00h:14m:49s
+Compiles Completed: 1/1
+Tests Completed: 1/1
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
index 8416413b47..fd4adb3416 100755
--- a/tests/logs/RegressionTests_gaea.log
+++ b/tests/logs/RegressionTests_gaea.log
@@ -1,7 +1,7 @@
 ====START OF GAEA REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-684ddd65adbf26b3a8003e05c8af6c4e19be63f8
+7639d7a8818635cfa1836d63c56d424d895adb6d
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,22 +11,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,280 +35,273 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /gpfs/f5/epic/world-shared/UFS-WM_RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /gpfs/f5/epic/scratch/Fernando.Andrade-maldonado/RT_RUNDIRS/Fernando.Andrade-maldonado/FV3_RT/rt_100835
+BASELINE DIRECTORY: /gpfs/f5/epic/world-shared/UFS-WM_RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /gpfs/f5/epic/scratch/Fernando.Andrade-maldonado/RT_RUNDIRS/Fernando.Andrade-maldonado/FV3_RT/rt_155270
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: epic
 * (-l) - USE CONFIG FILE: rt.conf
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [25:06, 24:37]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [11:14, 08:17](3070 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [24:06, 24:03]
-PASS -- TEST 'cpld_control_gfsv17_intel' [16:28, 13:41](1687 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [17:02, 14:24](1810 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [10:29, 06:48](947 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [18:23, 14:53](1671 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [15:10, 14:56]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [27:17, 23:53](1709 MB)
-
-PASS -- COMPILE 's2swa_intel' [20:06, 19:37]
-PASS -- TEST 'cpld_control_p8_intel' [12:33, 08:41](3101 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [12:53, 08:38](3099 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [08:13, 05:53](3157 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [12:33, 08:34](3124 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [08:13, 05:52](3178 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [11:02, 07:03](3410 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [12:19, 08:28](3101 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [11:02, 07:41](3022 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [12:17, 08:39](3102 MB)
-PASS -- TEST 'cpld_control_c192_p8_intel' [17:06, 10:58](3275 MB)
-PASS -- TEST 'cpld_restart_c192_p8_intel' [12:44, 08:09](3605 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [21:17, 13:19](4043 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [18:04, 09:47](4343 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [12:03, 08:29](3067 MB)
-
-PASS -- COMPILE 's2sw_intel' [19:06, 18:24]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [07:52, 05:21](1685 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [08:04, 05:30](1730 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [15:10, 14:46]
-PASS -- TEST 'cpld_debug_p8_intel' [12:55, 10:26](3131 MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [20:06, 19:11]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [09:36, 06:11](1701 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [18:06, 17:51]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [08:10, 05:33](1729 MB)
-
-PASS -- COMPILE 's2s_intel' [24:06, 23:42]
-PASS -- TEST 'cpld_control_c48_intel' [09:56, 06:56](2663 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [24:06, 23:20]
-PASS -- TEST 'cpld_control_p8_faster_intel' [12:01, 08:29](3099 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [25:10, 24:54]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [18:04, 15:26](1703 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [11:59, 07:32](1000 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [21:50, 18:26](1682 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [14:06, 13:57]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [31:15, 26:53](1720 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [16:07, 15:52]
-PASS -- TEST 'control_flake_intel' [05:03, 03:48](675 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [05:04, 02:35](619 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [04:00, 02:40](627 MB)
-PASS -- TEST 'control_latlon_intel' [04:02, 02:39](622 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [05:32, 02:43](623 MB)
-PASS -- TEST 'control_c48_intel' [07:24, 05:39](721 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [07:47, 05:38](721 MB)
-PASS -- TEST 'control_c192_intel' [11:21, 08:51](738 MB)
-PASS -- TEST 'control_c384_intel' [18:43, 16:51](1042 MB)
-PASS -- TEST 'control_c384gdas_intel' [18:32, 14:32](1181 MB)
-PASS -- TEST 'control_stochy_intel' [04:02, 01:57](626 MB)
-PASS -- TEST 'control_stochy_restart_intel' [03:13, 01:26](429 MB)
-PASS -- TEST 'control_lndp_intel' [04:02, 01:51](628 MB)
-PASS -- TEST 'control_iovr4_intel' [04:45, 02:42](623 MB)
-PASS -- TEST 'control_iovr5_intel' [04:39, 02:39](623 MB)
-PASS -- TEST 'control_p8_intel' [06:07, 03:22](1605 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [07:38, 03:39](1608 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [06:07, 03:39](1609 MB)
-PASS -- TEST 'control_restart_p8_intel' [04:27, 01:51](790 MB)
-PASS -- TEST 'control_noqr_p8_intel' [06:24, 03:46](1595 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [04:37, 02:34](793 MB)
-PASS -- TEST 'control_decomp_p8_intel' [05:19, 03:29](1594 MB)
-PASS -- TEST 'control_2threads_p8_intel' [05:53, 03:17](1687 MB)
-PASS -- TEST 'control_p8_lndp_intel' [07:56, 05:34](1607 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [07:23, 04:13](1657 MB)
-PASS -- TEST 'control_p8_mynn_intel' [07:36, 03:59](1615 MB)
-PASS -- TEST 'merra2_thompson_intel' [06:47, 04:15](1616 MB)
-PASS -- TEST 'regional_control_intel' [06:50, 04:54](615 MB)
-PASS -- TEST 'regional_restart_intel' [04:10, 02:37](789 MB)
-PASS -- TEST 'regional_decomp_intel' [06:38, 04:58](615 MB)
-PASS -- TEST 'regional_2threads_intel' [04:50, 02:59](758 MB)
-PASS -- TEST 'regional_noquilt_intel' [06:52, 04:36](1153 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [07:03, 04:54](615 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [07:01, 04:53](615 MB)
-PASS -- TEST 'regional_wofs_intel' [11:03, 06:48](1591 MB)
-
-PASS -- COMPILE 'rrfs_intel' [17:06, 16:37]
-PASS -- TEST 'rap_control_intel' [09:23, 07:09](1009 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [06:13, 04:08](1185 MB)
-PASS -- TEST 'rap_decomp_intel' [09:22, 07:17](1009 MB)
-PASS -- TEST 'rap_2threads_intel' [08:17, 06:20](1100 MB)
-PASS -- TEST 'rap_restart_intel' [05:14, 03:41](880 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [09:28, 06:55](1007 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [09:14, 07:22](1005 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [08:54, 05:28](879 MB)
-PASS -- TEST 'hrrr_control_intel' [06:10, 03:54](1005 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [06:10, 04:28](1006 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [05:10, 03:29](1086 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [03:38, 02:32](837 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [08:24, 06:47](1003 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [09:38, 08:23](1963 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:40, 08:29](1950 MB)
-
-PASS -- COMPILE 'csawmg_intel' [13:06, 12:56]
-PASS -- TEST 'control_csawmg_intel' [07:50, 06:39](695 MB)
-PASS -- TEST 'control_csawmgt_intel' [07:50, 06:37](691 MB)
-PASS -- TEST 'control_ras_intel' [04:37, 03:25](657 MB)
-
-PASS -- COMPILE 'wam_intel' [14:07, 13:10]
-PASS -- TEST 'control_wam_intel' [03:40, 02:31](369 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [18:08, 17:06]
-PASS -- TEST 'control_p8_faster_intel' [06:02, 03:53](1608 MB)
-PASS -- TEST 'regional_control_faster_intel' [06:00, 04:38](614 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [14:06, 13:40]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [04:51, 03:16](777 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [04:47, 03:19](781 MB)
-PASS -- TEST 'control_stochy_debug_intel' [04:31, 03:19](784 MB)
-PASS -- TEST 'control_lndp_debug_intel' [03:25, 02:58](788 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [05:47, 04:29](823 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [05:47, 04:22](825 MB)
-PASS -- TEST 'control_ras_debug_intel' [03:26, 02:57](794 MB)
-PASS -- TEST 'control_diag_debug_intel' [03:36, 03:00](842 MB)
-PASS -- TEST 'control_debug_p8_intel' [04:43, 03:22](1620 MB)
-PASS -- TEST 'regional_debug_intel' [19:24, 17:01](634 MB)
-PASS -- TEST 'rap_control_debug_intel' [06:31, 05:14](1166 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [06:31, 05:25](1165 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [06:35, 05:06](1167 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [06:47, 05:27](1167 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [08:10, 05:25](1166 MB)
-PASS -- TEST 'rap_diag_debug_intel' [06:33, 05:24](1255 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [08:03, 05:29](1166 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [07:52, 05:32](1167 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [07:52, 05:09](1168 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [08:36, 05:28](1166 MB)
-PASS -- TEST 'rap_noah_debug_intel' [07:30, 04:59](1165 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [07:30, 05:27](1164 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [10:28, 08:11](1166 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [06:48, 05:19](1163 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [08:35, 06:32](1168 MB)
-PASS -- TEST 'rap_flake_debug_intel' [06:38, 05:11](1166 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [11:04, 08:51](1169 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [10:07, 09:24]
-PASS -- TEST 'control_wam_debug_intel' [07:33, 05:27](396 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [16:06, 15:33]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [07:09, 04:12](1052 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [09:00, 06:00](889 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [07:06, 03:52](886 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [07:58, 05:31](947 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [06:07, 03:07](938 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:58, 04:12](887 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [07:02, 04:35](783 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [03:37, 02:03](765 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [17:06, 16:50]
-PASS -- TEST 'conus13km_control_intel' [04:58, 03:02](1094 MB)
-PASS -- TEST 'conus13km_2threads_intel' [03:58, 01:41](1073 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [03:48, 01:40](974 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [14:10, 13:53]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [06:10, 04:35](904 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [11:05, 10:37]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [06:23, 05:15](1047 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [06:23, 05:26](1048 MB)
-PASS -- TEST 'conus13km_debug_intel' [17:00, 15:05](1129 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [16:48, 14:59](805 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [10:15, 08:28](1110 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [16:08, 14:26](1195 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [11:05, 10:45]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:38, 05:23](1067 MB)
-
-PASS -- COMPILE 'hafsw_intel' [19:07, 18:27]
-PASS -- TEST 'hafs_regional_atm_intel' [07:33, 05:20](707 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [05:57, 04:46](1057 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [11:02, 07:57](753 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [14:40, 12:09](784 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [17:09, 13:08](803 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [09:15, 05:36](478 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [10:43, 07:00](497 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [06:27, 03:03](373 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [13:22, 08:20](444 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [06:00, 04:06](507 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [06:13, 03:39](510 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [07:27, 04:38](575 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:41, 01:45](401 MB)
-PASS -- TEST 'gnv1_nested_intel' [07:16, 04:10](763 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [19:06, 18:29]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [15:09, 13:17](587 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [23:07, 22:44]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [10:26, 07:53](622 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [10:26, 07:49](787 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [21:10, 20:40]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [08:08, 06:13](788 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [19:06, 18:46]
-PASS -- TEST 'hafs_regional_docn_intel' [08:16, 06:21](748 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [08:19, 06:33](729 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [23:15, 20:13](893 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [14:09, 13:26]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:53, 02:38](758 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [11:22, 01:45](747 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:52, 02:35](637 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [04:24, 02:42](637 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:26, 02:35](637 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [04:26, 02:38](756 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [04:21, 02:40](758 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:27, 02:41](637 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [19:14, 06:31](691 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [19:15, 06:32](674 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [14:21, 02:47](758 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [15:30, 04:38](1952 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [16:28, 04:48](2012 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [10:06, 09:14]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [17:26, 06:01](739 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [15:10, 14:14]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [14:26, 02:53](758 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [05:10, 04:10]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [16:04, 04:17](318 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [14:55, 02:47](455 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [03:04, 01:24](456 MB)
-
-PASS -- COMPILE 'atml_intel' [16:10, 16:01]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [20:56, 08:37](1633 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [22:57, 07:41](1633 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [06:00, 04:10](837 MB)
-
-PASS -- COMPILE 'atmw_intel' [19:10, 18:08]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [15:25, 03:18](1648 MB)
-
-PASS -- COMPILE 'atmwm_intel' [17:10, 16:58]
-PASS -- TEST 'control_atmwav_intel' [14:20, 02:58](640 MB)
-
-PASS -- COMPILE 'atmaero_intel' [22:10, 21:21]
-PASS -- TEST 'atmaero_control_p8_intel' [14:33, 06:48](2943 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [15:27, 07:33](3012 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [14:12, 08:01](3019 MB)
-
-PASS -- COMPILE 'atmaq_intel' [16:10, 15:21]
-
-PASS -- COMPILE 'atmaq_debug_intel' [12:10, 11:16]
-PASS -- TEST 'regional_atmaq_debug_intel' [32:42, 18:39](4477 MB)
+PASS -- COMPILE 's2swa_32bit_intel' [21:12, 20:57]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [13:01, 07:26](3070 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [25:16, 25:05]
+PASS -- TEST 'cpld_control_gfsv17_intel' [17:43, 13:45](1687 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [19:19, 14:45](1808 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [11:28, 07:11](944 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [18:22, 15:22](1669 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [14:12, 13:49]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [30:10, 24:28](1706 MB)
+
+PASS -- COMPILE 's2swa_intel' [08:20, 07:49]
+PASS -- TEST 'cpld_control_p8_intel' [14:09, 08:24](3097 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [15:48, 08:27](3097 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [11:18, 05:14](3153 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [13:56, 08:45](3121 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [11:18, 05:44](3174 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [12:44, 07:07](3410 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [33:57, 08:19](3095 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [11:47, 07:27](3019 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [15:00, 08:19](3098 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [24:12, 10:42](3264 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [22:41, 07:26](3601 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [45:00, 13:46](4038 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [41:40, 09:26](4346 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [13:24, 07:52](3065 MB)
+
+PASS -- COMPILE 's2sw_intel' [20:16, 19:28]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [08:41, 05:01](1686 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [11:28, 05:29](1729 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [14:12, 13:24]
+PASS -- TEST 'cpld_debug_p8_intel' [17:56, 10:09](3129 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [14:12, 13:28]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [11:29, 05:58](1699 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [18:13, 17:17]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [11:14, 05:34](1727 MB)
+
+PASS -- COMPILE 's2s_intel' [18:13, 17:15]
+PASS -- TEST 'cpld_control_c48_intel' [09:11, 06:56](2664 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [23:12, 23:04]
+PASS -- TEST 'cpld_control_p8_faster_intel' [14:58, 08:16](3100 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [26:14, 25:21]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [20:57, 15:36](1700 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [15:21, 08:10](999 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [23:56, 17:34](1681 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [14:12, 13:59]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [30:51, 26:32](1718 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [15:14, 15:00]
+PASS -- TEST 'control_flake_intel' [05:20, 03:48](675 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [06:14, 03:11](1567 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [06:25, 03:07](1580 MB)
+PASS -- TEST 'control_latlon_intel' [05:03, 03:03](1570 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [06:06, 03:08](1568 MB)
+PASS -- TEST 'control_c48_intel' [09:35, 06:40](1604 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [07:45, 05:40](724 MB)
+PASS -- TEST 'control_c192_intel' [13:00, 10:02](1682 MB)
+PASS -- TEST 'control_c384_intel' [23:55, 18:02](1984 MB)
+PASS -- TEST 'control_c384gdas_intel' [28:28, 14:13](1185 MB)
+PASS -- TEST 'control_stochy_intel' [03:20, 01:57](626 MB)
+PASS -- TEST 'control_stochy_restart_intel' [02:48, 01:40](431 MB)
+PASS -- TEST 'control_lndp_intel' [03:20, 01:52](628 MB)
+PASS -- TEST 'control_iovr4_intel' [04:33, 02:38](623 MB)
+PASS -- TEST 'control_iovr5_intel' [04:33, 02:38](622 MB)
+PASS -- TEST 'control_p8_intel' [06:51, 03:24](1605 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [07:31, 03:34](1607 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [08:04, 03:25](1609 MB)
+PASS -- TEST 'control_restart_p8_intel' [04:31, 01:52](789 MB)
+PASS -- TEST 'control_noqr_p8_intel' [06:51, 03:34](1596 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [04:31, 01:47](792 MB)
+PASS -- TEST 'control_decomp_p8_intel' [06:51, 03:29](1594 MB)
+PASS -- TEST 'control_2threads_p8_intel' [06:39, 02:49](1687 MB)
+PASS -- TEST 'control_p8_lndp_intel' [08:25, 05:27](1606 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [09:07, 04:19](1657 MB)
+PASS -- TEST 'control_p8_mynn_intel' [09:19, 03:41](1615 MB)
+PASS -- TEST 'merra2_thompson_intel' [08:01, 04:01](1604 MB)
+PASS -- TEST 'regional_control_intel' [07:40, 05:02](615 MB)
+PASS -- TEST 'regional_restart_intel' [04:26, 02:40](789 MB)
+PASS -- TEST 'regional_decomp_intel' [07:14, 05:06](615 MB)
+PASS -- TEST 'regional_2threads_intel' [05:27, 02:55](756 MB)
+PASS -- TEST 'regional_noquilt_intel' [07:09, 04:41](1155 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [07:02, 04:45](615 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [06:29, 04:44](615 MB)
+PASS -- TEST 'regional_wofs_intel' [09:36, 06:23](1591 MB)
+
+PASS -- COMPILE 'rrfs_intel' [14:17, 14:07]
+PASS -- TEST 'rap_control_intel' [09:22, 06:57](1010 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [12:25, 04:25](1187 MB)
+PASS -- TEST 'rap_decomp_intel' [09:39, 07:08](1009 MB)
+PASS -- TEST 'rap_2threads_intel' [08:56, 06:13](1097 MB)
+PASS -- TEST 'rap_restart_intel' [06:15, 03:59](880 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [10:14, 06:49](1007 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [09:41, 07:11](1005 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [07:08, 04:52](880 MB)
+PASS -- TEST 'hrrr_control_intel' [06:34, 03:53](1005 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [06:48, 04:20](1006 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [05:54, 03:13](1087 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [02:45, 01:58](838 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [10:06, 07:05](1003 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [09:04, 08:02](1967 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:57, 08:18](1952 MB)
+
+PASS -- COMPILE 'csawmg_intel' [14:17, 13:44]
+PASS -- TEST 'control_csawmg_intel' [08:35, 06:51](695 MB)
+PASS -- TEST 'control_ras_intel' [04:50, 03:31](657 MB)
+
+PASS -- COMPILE 'wam_intel' [14:13, 13:56]
+PASS -- TEST 'control_wam_intel' [03:39, 02:19](369 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [17:12, 17:00]
+PASS -- TEST 'control_p8_faster_intel' [06:45, 03:19](1607 MB)
+PASS -- TEST 'regional_control_faster_intel' [06:22, 04:38](614 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [17:12, 17:04]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [05:29, 03:07](1586 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [04:23, 02:56](1589 MB)
+PASS -- TEST 'control_stochy_debug_intel' [04:54, 03:11](784 MB)
+PASS -- TEST 'control_lndp_debug_intel' [03:50, 02:55](788 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [06:22, 04:32](824 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:51, 02:53](793 MB)
+PASS -- TEST 'control_diag_debug_intel' [04:49, 03:05](1640 MB)
+PASS -- TEST 'control_debug_p8_intel' [05:19, 03:18](1618 MB)
+PASS -- TEST 'regional_debug_intel' [18:22, 16:20](632 MB)
+PASS -- TEST 'rap_control_debug_intel' [06:46, 05:09](1166 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [05:42, 05:03](1164 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [05:53, 05:00](1166 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [06:52, 05:17](1166 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:35, 05:19](1166 MB)
+PASS -- TEST 'rap_diag_debug_intel' [07:58, 05:11](1251 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:44, 05:06](1166 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [06:33, 05:13](1167 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [06:50, 05:14](1168 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [06:43, 05:09](1166 MB)
+PASS -- TEST 'rap_noah_debug_intel' [05:47, 05:00](1167 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [06:54, 05:20](1164 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [09:55, 08:08](1166 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [06:49, 05:14](1163 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [06:53, 05:56](1168 MB)
+PASS -- TEST 'rap_flake_debug_intel' [05:59, 05:04](1166 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [12:42, 08:28](1169 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [15:17, 14:40]
+PASS -- TEST 'control_wam_debug_intel' [09:47, 05:16](396 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [14:12, 13:22]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [21:06, 03:47](1053 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [12:34, 05:56](888 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [09:52, 03:24](884 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [11:29, 05:21](950 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [08:10, 02:48](937 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [12:53, 03:40](886 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [09:33, 04:21](782 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [07:56, 02:07](764 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [21:13, 20:51]
+PASS -- TEST 'conus13km_control_intel' [16:09, 02:09](1094 MB)
+PASS -- TEST 'conus13km_2threads_intel' [05:02, 01:13](1074 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [03:21, 01:49](974 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [14:13, 13:37]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [14:30, 04:40](904 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [11:12, 10:41]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [13:53, 05:11](1048 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [14:57, 05:00](1048 MB)
+PASS -- TEST 'conus13km_debug_intel' [25:53, 14:08](1129 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [25:43, 14:19](805 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [19:40, 08:24](1108 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [26:35, 14:27](1195 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [35:18, 34:50]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:59, 05:07](1067 MB)
+
+PASS -- COMPILE 'hafsw_intel' [18:15, 17:13]
+PASS -- TEST 'hafs_regional_atm_intel' [15:40, 05:21](706 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [13:44, 04:48](1059 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [17:58, 07:39](751 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [22:06, 11:30](785 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [24:16, 12:51](802 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [16:00, 05:21](478 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [16:37, 06:49](500 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [12:40, 03:02](372 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [20:39, 08:15](444 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [10:59, 03:44](510 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [12:06, 03:47](510 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [10:39, 04:51](574 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [05:07, 01:46](402 MB)
+PASS -- TEST 'gnv1_nested_intel' [09:11, 04:19](766 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [12:16, 11:48]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [24:32, 13:03](584 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [20:12, 19:57]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [11:12, 07:51](618 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [11:15, 07:59](788 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [55:18, 54:16]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [10:48, 06:01](787 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [17:12, 16:22]
+PASS -- TEST 'hafs_regional_docn_intel' [08:47, 06:08](745 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [09:33, 06:14](730 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [29:12, 20:07](893 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [13:11, 12:29]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:50, 02:37](758 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:38, 01:39](734 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:36, 02:38](639 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:53, 02:37](639 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [03:39, 02:28](639 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:47, 02:39](757 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [03:45, 02:34](758 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:42, 02:26](639 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [13:46, 08:18](692 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [13:35, 08:17](676 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:29, 02:44](756 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:44, 04:46](2012 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [05:55, 04:46](2011 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [09:10, 08:26]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [07:50, 05:40](729 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [13:14, 12:40]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:37, 02:46](758 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [05:14, 04:59]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [06:27, 02:59](310 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [05:26, 02:24](456 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [04:22, 01:23](456 MB)
+
+PASS -- COMPILE 'atml_intel' [38:14, 37:39]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [12:44, 07:32](1633 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [12:44, 07:37](1633 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [07:44, 04:24](837 MB)
+
+PASS -- COMPILE 'atmw_intel' [16:13, 15:59]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [06:21, 02:21](1648 MB)
+
+PASS -- COMPILE 'atmaero_intel' [16:16, 15:16]
+PASS -- TEST 'atmaero_control_p8_intel' [11:03, 06:33](2946 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [11:03, 06:50](3013 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [10:55, 06:49](3019 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [12:11, 11:13]
+PASS -- TEST 'regional_atmaq_debug_intel' [29:03, 18:39](4495 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240415 16:40:32
-Ending Date/Time: 20240415 18:27:41
-Total Time: 01h:47m:54s
-Compiles Completed: 39/39
-Tests Completed: 182/182
+Starting Date/Time: 20240423 15:27:48
+Ending Date/Time: 20240423 18:09:15
+Total Time: 02h:42m:47s
+Compiles Completed: 37/37
+Tests Completed: 179/179
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
index a7d21eb746..fac7b77819 100644
--- a/tests/logs/RegressionTests_hera.log
+++ b/tests/logs/RegressionTests_hera.log
@@ -1,7 +1,7 @@
 ====START OF HERA REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-684ddd65adbf26b3a8003e05c8af6c4e19be63f8
+bcc92327e9e244c4ca9db1707f4df177799426b2
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -9,13 +9,13 @@ Submodule hashes used in testing:
  c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 CICE-interface/CICE (CICE6.0.0-447-gc9e4679)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -24,374 +24,365 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_RT/rt_3831458
+BASELINE DIRECTORY: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_3337654
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: epic
 * (-l) - USE CONFIG FILE: rt.conf
-* (-e) - USE ECFLOW
-
-PASS -- COMPILE 's2swa_32bit_intel' [13:07, 12:41]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [11:31, 05:42](3190 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [18:07, 17:08]
-PASS -- TEST 'cpld_control_gfsv17_intel' [19:03, 17:07](1760 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [19:11, 17:52](2026 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [11:04, 08:05](1123 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [20:56, 19:17](1648 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [05:07, 04:35]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [25:04, 22:40](1695 MB)
-
-PASS -- COMPILE 's2swa_intel' [13:07, 12:42]
-PASS -- TEST 'cpld_control_p8_intel' [12:25, 06:09](3213 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [11:35, 05:56](3228 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [06:25, 03:28](3239 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [11:29, 05:58](3247 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [07:28, 03:28](3282 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [11:22, 05:42](3537 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [11:22, 05:57](3201 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [10:20, 04:57](3060 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [11:34, 05:56](3223 MB)
-PASS -- TEST 'cpld_control_c192_p8_intel' [17:17, 10:28](3357 MB)
-PASS -- TEST 'cpld_restart_c192_p8_intel' [10:05, 06:08](3632 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [20:39, 09:54](4165 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [16:16, 06:15](4361 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [11:24, 05:36](3175 MB)
-
-PASS -- COMPILE 's2sw_intel' [13:07, 12:22]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [10:16, 04:55](1749 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [10:21, 04:27](1788 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [05:06, 04:35]
-PASS -- TEST 'cpld_debug_p8_intel' [11:08, 08:33](3241 MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [05:06, 04:06]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [07:59, 05:44](1761 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [12:06, 11:28]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [06:54, 04:25](1790 MB)
-
-PASS -- COMPILE 's2s_intel' [12:06, 11:29]
-PASS -- TEST 'cpld_control_c48_intel' [11:37, 09:27](2834 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [17:07, 16:23]
-PASS -- TEST 'cpld_control_p8_faster_intel' [07:14, 05:34](3231 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [17:08, 15:01]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [20:00, 17:19](1777 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [10:07, 08:04](1175 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [21:59, 19:44](1685 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [06:07, 04:02]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [28:52, 25:27](1729 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [13:07, 11:18]
-PASS -- TEST 'control_flake_intel' [04:21, 03:19](711 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [03:20, 02:23](664 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [03:23, 02:29](659 MB)
-PASS -- TEST 'control_latlon_intel' [03:18, 02:25](662 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:25, 02:27](655 MB)
-PASS -- TEST 'control_c48_intel' [07:22, 06:22](877 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [07:22, 06:22](878 MB)
-PASS -- TEST 'control_c192_intel' [10:39, 09:09](855 MB)
-PASS -- TEST 'control_c384_intel' [11:30, 09:14](1297 MB)
-PASS -- TEST 'control_c384gdas_intel' [11:21, 07:58](1404 MB)
-PASS -- TEST 'control_stochy_intel' [02:18, 01:36](660 MB)
-PASS -- TEST 'control_stochy_restart_intel' [02:24, 00:59](503 MB)
-PASS -- TEST 'control_lndp_intel' [02:17, 01:34](661 MB)
-PASS -- TEST 'control_iovr4_intel' [03:19, 02:26](656 MB)
-PASS -- TEST 'control_iovr5_intel' [04:18, 02:25](659 MB)
-PASS -- TEST 'control_p8_intel' [04:51, 02:57](1636 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [04:55, 02:56](1637 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [04:52, 02:53](1631 MB)
-PASS -- TEST 'control_restart_p8_intel' [03:45, 01:36](891 MB)
-PASS -- TEST 'control_noqr_p8_intel' [03:51, 02:56](1617 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [04:51, 01:36](933 MB)
-PASS -- TEST 'control_decomp_p8_intel' [06:54, 02:59](1619 MB)
-PASS -- TEST 'control_2threads_p8_intel' [06:51, 02:46](1718 MB)
-PASS -- TEST 'control_p8_lndp_intel' [08:45, 05:13](1634 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [07:53, 03:57](1707 MB)
-PASS -- TEST 'control_p8_mynn_intel' [06:58, 03:00](1619 MB)
-PASS -- TEST 'merra2_thompson_intel' [07:53, 03:34](1623 MB)
-PASS -- TEST 'regional_control_intel' [08:38, 05:12](852 MB)
-PASS -- TEST 'regional_restart_intel' [03:35, 02:45](1022 MB)
-PASS -- TEST 'regional_decomp_intel' [08:35, 05:32](850 MB)
-PASS -- TEST 'regional_2threads_intel' [05:36, 03:18](848 MB)
-PASS -- TEST 'regional_noquilt_intel' [07:37, 05:12](1360 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [07:34, 05:10](855 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [06:36, 05:14](853 MB)
-PASS -- TEST 'regional_wofs_intel' [09:35, 06:43](1915 MB)
-
-PASS -- COMPILE 'rrfs_intel' [13:09, 10:37]
-PASS -- TEST 'rap_control_intel' [08:35, 07:42](1102 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [07:00, 04:09](1302 MB)
-PASS -- TEST 'rap_decomp_intel' [10:30, 08:07](1043 MB)
-PASS -- TEST 'rap_2threads_intel' [09:31, 07:14](1180 MB)
-PASS -- TEST 'rap_restart_intel' [04:41, 04:02](1111 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [08:36, 07:40](1105 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [10:31, 08:06](1041 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [07:38, 05:47](1140 MB)
-PASS -- TEST 'hrrr_control_intel' [05:31, 03:55](1043 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [05:29, 04:05](1034 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [04:35, 03:37](1112 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [03:24, 02:09](1006 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [08:41, 07:33](1098 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [10:21, 09:19](1998 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:25, 08:59](2068 MB)
-
-PASS -- COMPILE 'csawmg_intel' [12:06, 10:17]
-PASS -- TEST 'control_csawmg_intel' [06:36, 06:01](761 MB)
-PASS -- TEST 'control_csawmgt_intel' [08:37, 05:58](760 MB)
-PASS -- TEST 'control_ras_intel' [04:18, 03:18](748 MB)
-
-PASS -- COMPILE 'csawmg_gnu' [06:05, 03:38]
-PASS -- TEST 'control_csawmg_gnu' [09:44, 08:17](548 MB)
-PASS -- TEST 'control_csawmgt_gnu' [09:43, 08:18](552 MB)
-
-PASS -- COMPILE 'wam_intel' [11:06, 09:37]
-PASS -- TEST 'control_wam_intel' [04:18, 02:04](655 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [12:05, 10:44]
-PASS -- TEST 'control_p8_faster_intel' [04:47, 02:36](1645 MB)
-PASS -- TEST 'regional_control_faster_intel' [06:37, 04:43](851 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [06:05, 04:43]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [04:19, 02:39](817 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:24, 02:37](802 MB)
-PASS -- TEST 'control_stochy_debug_intel' [03:17, 02:57](820 MB)
-PASS -- TEST 'control_lndp_debug_intel' [06:16, 02:39](822 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [06:34, 04:05](877 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [05:34, 04:04](868 MB)
-PASS -- TEST 'control_ras_debug_intel' [03:17, 02:43](823 MB)
-PASS -- TEST 'control_diag_debug_intel' [03:27, 02:42](878 MB)
-PASS -- TEST 'control_debug_p8_intel' [03:41, 02:53](1623 MB)
-PASS -- TEST 'regional_debug_intel' [18:37, 17:16](840 MB)
-PASS -- TEST 'rap_control_debug_intel' [05:19, 04:53](1212 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [05:18, 04:51](1206 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [05:19, 04:49](1210 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [05:17, 04:47](1215 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:16, 04:49](1212 MB)
-PASS -- TEST 'rap_diag_debug_intel' [06:31, 05:07](1292 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [06:18, 05:04](1211 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [06:16, 05:03](1165 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [05:18, 04:56](1206 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:18, 04:50](1215 MB)
-PASS -- TEST 'rap_noah_debug_intel' [07:18, 04:43](1214 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [07:18, 04:50](1199 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [10:18, 08:00](1207 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [07:19, 04:51](1209 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [08:19, 06:05](1214 MB)
-PASS -- TEST 'rap_flake_debug_intel' [06:16, 04:44](1207 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [10:34, 08:26](1217 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_gnu' [04:05, 02:51]
-PASS -- TEST 'control_csawmg_debug_gnu' [03:35, 02:10](533 MB)
-PASS -- TEST 'control_csawmgt_debug_gnu' [03:32, 02:10](531 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [04:06, 03:09]
-PASS -- TEST 'control_wam_debug_intel' [06:17, 05:01](518 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [11:05, 10:08]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [04:58, 03:56](1167 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [07:32, 06:24](1053 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [04:32, 03:23](993 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [08:29, 06:07](1070 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [05:29, 03:08](966 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:27, 03:37](932 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [08:35, 04:57](1021 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [04:20, 01:51](929 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [13:06, 12:27]
-PASS -- TEST 'conus13km_control_intel' [03:51, 02:04](1210 MB)
-PASS -- TEST 'conus13km_2threads_intel' [03:35, 00:52](1125 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [03:38, 01:13](1111 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [11:05, 10:18]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [06:38, 04:11](987 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:05, 03:21]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [06:17, 04:52](1093 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [06:17, 04:39](1087 MB)
-PASS -- TEST 'conus13km_debug_intel' [15:44, 14:23](1244 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [15:42, 14:39](926 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [09:36, 08:07](1159 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [15:38, 14:52](1308 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [04:06, 03:25]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:19, 05:00](1132 MB)
-
-PASS -- COMPILE 'hafsw_intel' [12:07, 11:52]
-PASS -- TEST 'hafs_regional_atm_intel' [08:07, 04:56](736 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [09:28, 06:01](1121 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [12:21, 06:54](830 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [17:12, 13:26](873 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [18:25, 15:00](890 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [09:06, 05:26](497 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [09:23, 06:38](492 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [04:35, 02:43](378 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [11:33, 07:10](485 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [07:44, 03:40](536 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [06:58, 03:32](529 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [05:50, 04:04](589 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [03:21, 01:13](409 MB)
-PASS -- TEST 'gnv1_nested_intel' [06:50, 04:06](802 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [04:05, 03:45]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [14:46, 12:44](577 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [13:06, 12:02]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [10:52, 08:42](677 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [10:57, 08:41](742 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [12:06, 11:43]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [07:56, 06:29](742 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [14:06, 11:02]
-PASS -- TEST 'hafs_regional_docn_intel' [08:07, 06:26](831 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [08:04, 06:33](833 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [19:54, 16:40](1211 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [08:06, 05:53]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [05:14, 02:43](1166 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:14, 01:37](1103 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [04:13, 02:39](1035 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:13, 02:39](1017 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [03:12, 02:36](1020 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:12, 02:41](1160 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [05:12, 02:44](1160 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [04:12, 02:32](1024 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [08:28, 06:11](1064 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [08:19, 06:15](1044 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [04:10, 02:42](1146 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:13, 03:48](2373 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [05:13, 04:09](2490 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [05:06, 02:59]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [07:14, 06:11](1080 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [08:07, 05:55]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:14, 02:43](1151 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [02:06, 01:03]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [02:24, 00:49](261 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [02:18, 00:52](325 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:18, 00:31](330 MB)
-
-PASS -- COMPILE 'atml_intel' [12:07, 12:00]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [07:59, 04:08](1612 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [07:56, 04:06](1621 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [05:43, 02:14](907 MB)
-
-PASS -- COMPILE 'atmw_intel' [11:07, 10:35]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [04:42, 01:45](1680 MB)
-
-PASS -- COMPILE 'atmwm_intel' [11:07, 10:42]
-PASS -- TEST 'control_atmwav_intel' [03:25, 01:42](679 MB)
-
-PASS -- COMPILE 'atmaero_intel' [12:06, 10:45]
-PASS -- TEST 'atmaero_control_p8_intel' [05:50, 03:58](3039 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [06:53, 04:52](3107 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [06:38, 05:04](3116 MB)
-
-PASS -- COMPILE 'atmaq_intel' [11:06, 10:07]
-
-PASS -- COMPILE 'atmaq_debug_intel' [04:07, 03:33]
-PASS -- TEST 'regional_atmaq_debug_intel' [50:41, 21:09](4521 MB)
-
-PASS -- COMPILE 'atm_gnu' [04:06, 03:36]
-PASS -- TEST 'control_c48_gnu' [11:19, 10:46](765 MB)
-PASS -- TEST 'control_stochy_gnu' [04:16, 03:25](509 MB)
-PASS -- TEST 'control_ras_gnu' [05:16, 04:46](517 MB)
-PASS -- TEST 'control_p8_gnu' [07:50, 04:46](1267 MB)
-PASS -- TEST 'control_p8_ugwpv1_gnu' [06:48, 04:32](1267 MB)
-PASS -- TEST 'control_flake_gnu' [12:17, 10:26](553 MB)
-
-PASS -- COMPILE 'rrfs_gnu' [05:06, 03:42]
-PASS -- TEST 'rap_control_gnu' [13:27, 10:58](864 MB)
-PASS -- TEST 'rap_decomp_gnu' [13:27, 10:58](861 MB)
-PASS -- TEST 'rap_2threads_gnu' [12:31, 09:47](942 MB)
-PASS -- TEST 'rap_restart_gnu' [08:34, 05:24](587 MB)
-PASS -- TEST 'rap_sfcdiff_gnu' [13:26, 10:53](861 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_gnu' [12:32, 11:02](862 MB)
-PASS -- TEST 'rap_sfcdiff_restart_gnu' [11:36, 08:04](587 MB)
-PASS -- TEST 'hrrr_control_gnu' [07:23, 05:37](859 MB)
-PASS -- TEST 'hrrr_control_noqr_gnu' [06:29, 05:38](842 MB)
-PASS -- TEST 'hrrr_control_2threads_gnu' [06:24, 05:04](933 MB)
-PASS -- TEST 'hrrr_control_decomp_gnu' [08:25, 05:41](864 MB)
-PASS -- TEST 'hrrr_control_restart_gnu' [06:18, 02:53](573 MB)
-PASS -- TEST 'hrrr_control_restart_noqr_gnu' [06:21, 02:52](666 MB)
-PASS -- TEST 'rrfs_v1beta_gnu' [12:33, 10:22](859 MB)
-
-PASS -- COMPILE 'atm_dyn32_debug_gnu' [04:06, 03:34]
-PASS -- TEST 'control_diag_debug_gnu' [02:25, 01:37](552 MB)
-PASS -- TEST 'regional_debug_gnu' [16:40, 11:28](566 MB)
-PASS -- TEST 'rap_control_debug_gnu' [07:17, 02:35](872 MB)
-PASS -- TEST 'hrrr_control_debug_gnu' [07:16, 02:37](873 MB)
-PASS -- TEST 'hrrr_gf_debug_gnu' [07:16, 02:41](875 MB)
-PASS -- TEST 'hrrr_c3_debug_gnu' [07:15, 02:35](875 MB)
-PASS -- TEST 'rap_diag_debug_gnu' [07:31, 02:54](956 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_gnu' [08:18, 04:07](869 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_gnu' [06:17, 02:36](872 MB)
-PASS -- TEST 'rrfs_v1beta_debug_gnu' [06:19, 02:37](864 MB)
-PASS -- TEST 'control_ras_debug_gnu' [05:15, 01:32](508 MB)
-PASS -- TEST 'control_stochy_debug_gnu' [05:14, 01:48](496 MB)
-PASS -- TEST 'control_debug_p8_gnu' [04:34, 01:39](1256 MB)
-PASS -- TEST 'rap_flake_debug_gnu' [05:17, 02:35](871 MB)
-PASS -- TEST 'rap_clm_lake_debug_gnu' [04:17, 02:57](874 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_gnu' [05:31, 04:23](876 MB)
-
-PASS -- COMPILE 'wam_debug_gnu' [03:07, 01:49]
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_gnu' [04:06, 03:34]
-PASS -- TEST 'rap_control_dyn32_phy32_gnu' [13:25, 09:31](716 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_gnu' [06:28, 04:59](714 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_gnu' [10:36, 08:44](766 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_gnu' [06:23, 04:33](757 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_gnu' [06:22, 05:00](719 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_gnu' [07:33, 06:57](562 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_gnu' [05:21, 02:37](545 MB)
-PASS -- TEST 'conus13km_control_gnu' [09:48, 03:16](886 MB)
-PASS -- TEST 'conus13km_2threads_gnu' [06:36, 05:33](896 MB)
-PASS -- TEST 'conus13km_restart_mismatch_gnu' [02:38, 01:47](567 MB)
-
-PASS -- COMPILE 'atm_dyn64_phy32_gnu' [07:07, 05:26]
-PASS -- TEST 'rap_control_dyn64_phy32_gnu' [06:30, 05:44](746 MB)
-
-PASS -- COMPILE 'atm_dyn32_phy32_debug_gnu' [04:06, 03:34]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_gnu' [03:16, 02:30](724 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_gnu' [08:15, 02:33](727 MB)
-PASS -- TEST 'conus13km_debug_gnu' [12:45, 06:59](901 MB)
-PASS -- TEST 'conus13km_debug_qr_gnu' [12:41, 06:54](589 MB)
-PASS -- TEST 'conus13km_debug_2threads_gnu' [12:40, 07:21](903 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_gnu' [12:39, 06:52](972 MB)
-
-PASS -- COMPILE 'atm_dyn64_phy32_debug_gnu' [05:06, 03:40]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_gnu' [08:17, 02:38](743 MB)
-
-PASS -- COMPILE 's2swa_gnu' [15:07, 14:38]
-
-PASS -- COMPILE 's2s_gnu' [16:07, 14:12]
-PASS -- TEST 'cpld_control_nowave_noaero_p8_gnu' [13:02, 06:38](1354 MB)
-
-PASS -- COMPILE 's2swa_debug_gnu' [04:06, 02:29]
-
-PASS -- COMPILE 's2sw_pdlib_gnu' [16:07, 14:21]
-PASS -- TEST 'cpld_control_pdlib_p8_gnu' [33:01, 27:13](1327 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_gnu' [03:07, 02:27]
-PASS -- TEST 'cpld_debug_pdlib_p8_gnu' [23:51, 18:18](1324 MB)
-
-PASS -- COMPILE 'datm_cdeps_gnu' [15:06, 13:56]
-PASS -- TEST 'datm_cdeps_control_cfsr_gnu' [08:14, 03:11](702 MB)
+* (-r) - USE ROCOTO
+
+PASS -- COMPILE 's2swa_32bit_intel' [12:43, 12:43]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [06:23, 05:34](3166 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [15:58, 15:58]
+PASS -- TEST 'cpld_control_gfsv17_intel' [17:56, 17:09](1739 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [18:47, 17:50](2011 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [08:56, 08:04](1097 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [19:58, 19:17](1630 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [04:18, 04:18]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [23:43, 22:57](1691 MB)
+
+PASS -- COMPILE 's2swa_intel' [12:44, 12:44]
+PASS -- TEST 'cpld_control_p8_intel' [06:45, 05:51](3196 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [06:40, 05:48](3208 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [04:29, 03:29](3257 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [06:51, 05:58](3241 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [04:44, 03:35](3243 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [06:16, 05:31](3560 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [06:40, 05:53](3192 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [05:32, 04:46](3053 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [06:37, 05:46](3189 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [11:56, 10:20](3317 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [08:56, 06:33](3550 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [15:13, 09:51](4144 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [13:44, 05:56](4342 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [06:27, 05:38](3150 MB)
+
+PASS -- COMPILE 's2sw_intel' [12:19, 12:19]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [05:51, 05:05](1735 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [05:30, 04:42](1767 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [04:19, 04:19]
+PASS -- TEST 'cpld_debug_p8_intel' [09:49, 08:47](3218 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [03:59, 03:59]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [06:38, 05:48](1765 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [11:36, 11:36]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [05:27, 04:38](1755 MB)
+
+PASS -- COMPILE 's2s_intel' [11:15, 11:15]
+PASS -- TEST 'cpld_control_c48_intel' [10:11, 09:40](2832 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [16:27, 16:27]
+PASS -- TEST 'cpld_control_p8_faster_intel' [06:28, 05:33](3193 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [15:20, 15:20]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [18:00, 17:11](1757 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [08:58, 08:01](1149 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [20:37, 19:49](1666 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [04:18, 04:18]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [25:51, 25:05](1678 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [11:13, 11:13]
+PASS -- TEST 'control_flake_intel' [03:33, 03:21](686 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [03:35, 02:53](1573 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [03:34, 02:58](1580 MB)
+PASS -- TEST 'control_latlon_intel' [03:24, 02:56](1576 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:31, 02:57](1576 MB)
+PASS -- TEST 'control_c48_intel' [08:16, 07:38](1744 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [06:44, 06:22](850 MB)
+PASS -- TEST 'control_c192_intel' [11:19, 10:35](1712 MB)
+PASS -- TEST 'control_c384_intel' [11:52, 10:30](1992 MB)
+PASS -- TEST 'control_c384gdas_intel' [10:40, 08:11](1353 MB)
+PASS -- TEST 'control_stochy_intel' [01:52, 01:37](643 MB)
+PASS -- TEST 'control_stochy_restart_intel' [01:11, 00:58](483 MB)
+PASS -- TEST 'control_lndp_intel' [01:47, 01:32](641 MB)
+PASS -- TEST 'control_iovr4_intel' [02:42, 02:30](639 MB)
+PASS -- TEST 'control_iovr5_intel' [02:38, 02:25](638 MB)
+PASS -- TEST 'control_p8_intel' [03:40, 02:58](1609 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [03:41, 02:59](1603 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [03:31, 02:52](1611 MB)
+PASS -- TEST 'control_restart_p8_intel' [02:11, 01:36](875 MB)
+PASS -- TEST 'control_noqr_p8_intel' [03:34, 02:57](1584 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [02:15, 01:37](923 MB)
+PASS -- TEST 'control_decomp_p8_intel' [03:39, 03:05](1578 MB)
+PASS -- TEST 'control_2threads_p8_intel' [03:18, 02:44](1698 MB)
+PASS -- TEST 'control_p8_lndp_intel' [05:46, 05:16](1595 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [04:36, 03:55](1678 MB)
+PASS -- TEST 'control_p8_mynn_intel' [03:41, 02:58](1617 MB)
+PASS -- TEST 'merra2_thompson_intel' [03:59, 03:17](1619 MB)
+PASS -- TEST 'regional_control_intel' [05:39, 05:09](834 MB)
+PASS -- TEST 'regional_restart_intel' [03:10, 02:45](1005 MB)
+PASS -- TEST 'regional_decomp_intel' [05:58, 05:30](827 MB)
+PASS -- TEST 'regional_2threads_intel' [03:44, 03:15](825 MB)
+PASS -- TEST 'regional_noquilt_intel' [05:34, 05:09](1349 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [05:40, 05:13](837 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [05:37, 05:11](836 MB)
+PASS -- TEST 'regional_wofs_intel' [07:07, 06:41](1897 MB)
+
+PASS -- COMPILE 'rrfs_intel' [10:35, 10:35]
+PASS -- TEST 'rap_control_intel' [08:09, 07:41](1097 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [04:47, 04:05](1287 MB)
+PASS -- TEST 'rap_decomp_intel' [08:29, 08:07](1023 MB)
+PASS -- TEST 'rap_2threads_intel' [07:49, 07:26](1160 MB)
+PASS -- TEST 'rap_restart_intel' [04:33, 04:01](1082 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [08:09, 07:43](1094 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [08:27, 08:06](1025 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [06:25, 05:56](1122 MB)
+PASS -- TEST 'hrrr_control_intel' [04:18, 03:57](1039 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [04:26, 04:05](1031 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [04:04, 03:38](1103 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [02:29, 02:10](990 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [08:03, 07:35](1088 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [09:33, 09:19](1965 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:16, 09:02](2046 MB)
+
+PASS -- COMPILE 'csawmg_intel' [10:16, 10:16]
+PASS -- TEST 'control_csawmg_intel' [06:31, 06:02](740 MB)
+PASS -- TEST 'control_ras_intel' [03:25, 03:15](739 MB)
+
+PASS -- COMPILE 'csawmg_gnu' [03:34, 03:33]
+PASS -- TEST 'control_csawmg_gnu' [08:53, 08:24](540 MB)
+
+PASS -- COMPILE 'wam_intel' [09:55, 09:55]
+PASS -- TEST 'control_wam_intel' [02:12, 02:02](638 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [10:41, 10:41]
+PASS -- TEST 'control_p8_faster_intel' [03:21, 02:39](1610 MB)
+PASS -- TEST 'regional_control_faster_intel' [05:18, 04:47](829 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [04:47, 04:47]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:20, 02:45](1570 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:15, 02:43](1577 MB)
+PASS -- TEST 'control_stochy_debug_intel' [03:23, 03:13](780 MB)
+PASS -- TEST 'control_lndp_debug_intel' [02:54, 02:43](783 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [04:38, 04:08](832 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:09, 02:57](790 MB)
+PASS -- TEST 'control_diag_debug_intel' [03:23, 02:46](1635 MB)
+PASS -- TEST 'control_debug_p8_intel' [03:32, 02:59](1605 MB)
+PASS -- TEST 'regional_debug_intel' [17:47, 17:20](810 MB)
+PASS -- TEST 'rap_control_debug_intel' [05:12, 04:58](1169 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [05:08, 04:54](1165 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [05:14, 04:59](1170 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [05:13, 04:59](1171 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [05:18, 05:01](1170 MB)
+PASS -- TEST 'rap_diag_debug_intel' [05:44, 05:10](1253 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:16, 05:04](1174 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [05:32, 05:17](1182 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [05:37, 05:21](1171 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:15, 04:59](1186 MB)
+PASS -- TEST 'rap_noah_debug_intel' [05:10, 04:56](1185 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [05:22, 05:08](1167 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [08:26, 08:11](1188 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [05:16, 05:00](1181 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [06:36, 06:25](1187 MB)
+PASS -- TEST 'rap_flake_debug_intel' [05:18, 05:06](1190 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [08:46, 08:22](1171 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_gnu' [02:43, 02:43]
+PASS -- TEST 'control_csawmg_debug_gnu' [02:36, 02:10](508 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [03:16, 03:15]
+PASS -- TEST 'control_wam_debug_intel' [05:11, 04:59](468 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [10:11, 10:11]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [04:36, 03:53](1140 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [06:44, 06:24](1032 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [03:47, 03:25](985 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [06:28, 06:06](1067 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [03:38, 03:14](946 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [04:00, 03:40](916 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [05:25, 04:50](1009 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:13, 01:52](916 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [12:24, 12:24]
+PASS -- TEST 'conus13km_control_intel' [02:54, 02:06](1187 MB)
+PASS -- TEST 'conus13km_2threads_intel' [01:24, 00:53](1099 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [01:49, 01:15](1090 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [10:18, 10:18]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [04:49, 04:14](969 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [03:42, 03:42]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:03, 04:51](1093 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [04:59, 04:47](1087 MB)
+PASS -- TEST 'conus13km_debug_intel' [15:27, 14:54](1269 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [15:16, 14:40](920 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [08:47, 08:20](1143 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [15:11, 14:44](1305 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [03:22, 03:22]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [05:02, 04:52](1134 MB)
+
+PASS -- COMPILE 'hafsw_intel' [11:34, 11:33]
+PASS -- TEST 'hafs_regional_atm_intel' [06:01, 05:04](742 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [06:20, 06:03](1118 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [07:59, 06:56](838 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [14:33, 13:35](863 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [16:13, 15:11](896 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [06:19, 05:39](505 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [08:00, 06:58](521 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [03:07, 02:38](376 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [09:33, 07:32](470 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [04:27, 03:54](532 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [04:19, 03:41](526 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [04:56, 04:12](592 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [01:32, 01:13](402 MB)
+PASS -- TEST 'gnv1_nested_intel' [04:44, 04:12](802 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [03:50, 03:50]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [13:29, 12:49](572 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [12:00, 12:00]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [09:38, 08:52](672 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [09:39, 08:50](705 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [11:56, 11:56]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [07:27, 06:40](737 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [11:14, 11:13]
+PASS -- TEST 'hafs_regional_docn_intel' [07:57, 06:49](829 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [07:57, 06:51](820 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [16:44, 16:03](1212 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [06:19, 06:18]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [02:58, 02:49](1149 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [01:52, 01:41](1095 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [02:47, 02:38](1022 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [02:47, 02:37](1025 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [02:47, 02:39](1017 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [02:51, 02:44](1146 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [02:51, 02:43](1134 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [02:47, 02:38](1016 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [07:29, 06:25](1061 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [07:16, 06:12](1041 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [02:51, 02:45](1146 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [04:09, 03:57](2486 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [04:05, 03:56](2441 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [02:59, 02:58]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:36, 06:27](1056 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [05:58, 05:56]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [02:49, 02:40](1146 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [01:05, 01:05]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [01:15, 00:53](262 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [01:16, 00:58](330 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [00:44, 00:31](328 MB)
+
+PASS -- COMPILE 'atml_intel' [11:55, 11:54]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [05:05, 04:16](1561 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [05:00, 04:14](1589 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [03:14, 02:38](876 MB)
+
+PASS -- COMPILE 'atmw_intel' [10:55, 10:54]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [02:24, 01:46](1647 MB)
+
+PASS -- COMPILE 'atmaero_intel' [10:42, 10:41]
+PASS -- TEST 'atmaero_control_p8_intel' [04:46, 03:58](3039 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [05:45, 04:58](3099 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [05:33, 05:01](3093 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [03:36, 03:35]
+PASS -- TEST 'regional_atmaq_debug_intel' [25:40, 24:01](4452 MB)
+
+PASS -- COMPILE 'atm_gnu' [03:52, 03:51]
+PASS -- TEST 'control_c48_gnu' [11:48, 11:17](1544 MB)
+PASS -- TEST 'control_stochy_gnu' [03:36, 03:23](507 MB)
+PASS -- TEST 'control_ras_gnu' [04:52, 04:39](515 MB)
+PASS -- TEST 'control_p8_gnu' [05:29, 04:40](1266 MB)
+PASS -- TEST 'control_p8_ugwpv1_gnu' [05:22, 04:38](1267 MB)
+PASS -- TEST 'control_flake_gnu' [10:46, 10:33](549 MB)
+
+PASS -- COMPILE 'rrfs_gnu' [03:52, 03:51]
+PASS -- TEST 'rap_control_gnu' [11:06, 10:41](855 MB)
+PASS -- TEST 'rap_decomp_gnu' [11:22, 10:59](858 MB)
+PASS -- TEST 'rap_2threads_gnu' [10:06, 09:42](940 MB)
+PASS -- TEST 'rap_restart_gnu' [06:21, 05:40](587 MB)
+PASS -- TEST 'rap_sfcdiff_gnu' [10:55, 10:29](858 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_gnu' [11:27, 11:01](858 MB)
+PASS -- TEST 'rap_sfcdiff_restart_gnu' [08:59, 08:19](588 MB)
+PASS -- TEST 'hrrr_control_gnu' [05:52, 05:28](857 MB)
+PASS -- TEST 'hrrr_control_noqr_gnu' [05:54, 05:30](847 MB)
+PASS -- TEST 'hrrr_control_2threads_gnu' [05:19, 04:56](928 MB)
+PASS -- TEST 'hrrr_control_decomp_gnu' [06:07, 05:41](856 MB)
+PASS -- TEST 'hrrr_control_restart_gnu' [03:13, 02:54](572 MB)
+PASS -- TEST 'hrrr_control_restart_noqr_gnu' [03:25, 02:56](667 MB)
+PASS -- TEST 'rrfs_v1beta_gnu' [11:09, 10:33](855 MB)
+
+PASS -- COMPILE 'atm_dyn32_debug_gnu' [03:40, 03:39]
+PASS -- TEST 'control_diag_debug_gnu' [02:26, 01:46](1285 MB)
+PASS -- TEST 'regional_debug_gnu' [11:44, 11:12](568 MB)
+PASS -- TEST 'rap_control_debug_gnu' [03:10, 02:54](871 MB)
+PASS -- TEST 'hrrr_control_debug_gnu' [03:05, 02:47](871 MB)
+PASS -- TEST 'hrrr_gf_debug_gnu' [02:47, 02:36](874 MB)
+PASS -- TEST 'hrrr_c3_debug_gnu' [02:50, 02:40](878 MB)
+PASS -- TEST 'rap_diag_debug_gnu' [03:14, 02:52](960 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_gnu' [04:19, 04:06](870 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_gnu' [02:54, 02:40](835 MB)
+PASS -- TEST 'rrfs_v1beta_debug_gnu' [02:54, 02:42](867 MB)
+PASS -- TEST 'control_ras_debug_gnu' [01:57, 01:42](506 MB)
+PASS -- TEST 'control_stochy_debug_gnu' [02:03, 01:50](499 MB)
+PASS -- TEST 'control_debug_p8_gnu' [02:22, 01:45](1253 MB)
+PASS -- TEST 'rap_flake_debug_gnu' [02:58, 02:45](871 MB)
+PASS -- TEST 'rap_clm_lake_debug_gnu' [03:11, 02:54](874 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_gnu' [04:46, 04:19](879 MB)
+
+PASS -- COMPILE 'wam_debug_gnu' [01:53, 01:52]
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_gnu' [03:39, 03:39]
+PASS -- TEST 'rap_control_dyn32_phy32_gnu' [09:55, 09:28](712 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_gnu' [05:28, 05:04](713 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_gnu' [09:04, 08:38](765 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_gnu' [04:59, 04:34](760 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_gnu' [05:35, 05:11](713 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_gnu' [07:42, 07:08](550 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_gnu' [02:59, 02:36](532 MB)
+PASS -- TEST 'conus13km_control_gnu' [03:59, 03:16](869 MB)
+PASS -- TEST 'conus13km_2threads_gnu' [05:38, 05:06](874 MB)
+PASS -- TEST 'conus13km_restart_mismatch_gnu' [02:22, 01:52](546 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_gnu' [05:27, 05:26]
+PASS -- TEST 'rap_control_dyn64_phy32_gnu' [06:22, 05:53](738 MB)
+
+PASS -- COMPILE 'atm_dyn32_phy32_debug_gnu' [03:41, 03:40]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_gnu' [02:43, 02:30](696 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_gnu' [02:45, 02:32](699 MB)
+PASS -- TEST 'conus13km_debug_gnu' [07:36, 06:57](870 MB)
+PASS -- TEST 'conus13km_debug_qr_gnu' [07:33, 06:59](559 MB)
+PASS -- TEST 'conus13km_debug_2threads_gnu' [07:30, 07:02](871 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_gnu' [07:30, 06:55](936 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_debug_gnu' [03:41, 03:40]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_gnu' [02:57, 02:40](720 MB)
+
+PASS -- COMPILE 's2swa_gnu' [14:39, 14:38]
+
+PASS -- COMPILE 's2s_gnu' [14:37, 14:37]
+PASS -- TEST 'cpld_control_nowave_noaero_p8_gnu' [07:44, 06:42](1341 MB)
+
+PASS -- COMPILE 's2swa_debug_gnu' [02:33, 02:32]
+
+PASS -- COMPILE 's2sw_pdlib_gnu' [14:17, 14:17]
+PASS -- TEST 'cpld_control_pdlib_p8_gnu' [23:22, 22:25](1308 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_gnu' [02:23, 02:22]
+PASS -- TEST 'cpld_debug_pdlib_p8_gnu' [13:52, 12:56](1306 MB)
+
+PASS -- COMPILE 'datm_cdeps_gnu' [14:14, 14:13]
+PASS -- TEST 'datm_cdeps_control_cfsr_gnu' [03:18, 03:06](696 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240415 20:36:04
-Ending Date/Time: 20240415 23:17:26
-Total Time: 02h:41m:40s
-Compiles Completed: 55/55
-Tests Completed: 244/244
+Starting Date/Time: 20240423 18:57:22
+Ending Date/Time: 20240424 03:03:55
+Total Time: 08h:06m:50s
+Compiles Completed: 53/53
+Tests Completed: 239/239
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
index 4cd5a52970..e5677021cf 100644
--- a/tests/logs/RegressionTests_hercules.log
+++ b/tests/logs/RegressionTests_hercules.log
@@ -1,7 +1,7 @@
 ====START OF HERCULES REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-684ddd65adbf26b3a8003e05c8af6c4e19be63f8
+fe4bb76565de0a5f3261b276fa392d65cb046e96
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,22 +11,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,369 +35,360 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /work2/noaa/stmp/zshrader/stmp/zshrader/FV3_RT/rt_1998392
+BASELINE DIRECTORY: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /work2/noaa/stmp/zshrader/stmp/zshrader/FV3_RT/rt_12578
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: epic
 * (-l) - USE CONFIG FILE: rt.conf
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [12:06, 11:19]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [09:00, 07:40](1895 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [17:06, 16:44]
-PASS -- TEST 'cpld_control_gfsv17_intel' [15:09, 13:25](1765 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [15:22, 14:03](2161 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [08:17, 06:26](1183 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [15:46, 15:03](1692 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [06:06, 05:09]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [22:03, 20:26](1724 MB)
-
-PASS -- COMPILE 's2swa_intel' [12:06, 11:26]
-PASS -- TEST 'cpld_control_p8_intel' [08:49, 07:35](2074 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [08:58, 07:41](2065 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [06:05, 04:13](1985 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [08:48, 07:42](1982 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [06:06, 04:16](1739 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [10:46, 09:11](2495 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [08:43, 07:32](2064 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [07:57, 06:16](1892 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [08:59, 07:45](2058 MB)
-PASS -- TEST 'cpld_control_c192_p8_intel' [17:38, 15:36](2803 MB)
-PASS -- TEST 'cpld_restart_c192_p8_intel' [08:19, 05:56](2926 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [15:37, 09:20](3629 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [14:11, 06:10](3621 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [05:51, 04:54](2051 MB)
-
-PASS -- COMPILE 's2sw_intel' [11:06, 10:30]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [08:46, 07:09](1769 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [04:50, 04:01](1821 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [05:06, 04:44]
-PASS -- TEST 'cpld_debug_p8_intel' [08:01, 06:51](2059 MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [05:06, 04:50]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [05:54, 04:47](1793 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [09:06, 08:20]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [04:47, 04:01](1821 MB)
-
-PASS -- COMPILE 's2s_intel' [09:06, 08:56]
-PASS -- TEST 'cpld_control_c48_intel' [08:35, 07:15](2838 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [13:06, 12:24]
-PASS -- TEST 'cpld_control_p8_faster_intel' [08:59, 07:20](2079 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [16:06, 15:58]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [14:52, 13:48](1808 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [08:20, 06:45](1268 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [17:02, 15:53](1730 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [05:06, 04:38]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [22:45, 21:37](1779 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [09:06, 08:14]
-PASS -- TEST 'control_flake_intel' [03:16, 02:54](712 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [03:19, 02:07](664 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [03:22, 02:14](685 MB)
-PASS -- TEST 'control_latlon_intel' [03:16, 02:10](665 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:23, 02:12](662 MB)
-PASS -- TEST 'control_c48_intel' [06:18, 05:48](853 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [06:19, 05:44](850 MB)
-PASS -- TEST 'control_c192_intel' [08:24, 07:55](968 MB)
-PASS -- TEST 'control_c384_intel' [10:01, 08:18](1433 MB)
-PASS -- TEST 'control_c384gdas_intel' [09:50, 07:16](1519 MB)
-PASS -- TEST 'control_stochy_intel' [02:15, 01:29](670 MB)
-PASS -- TEST 'control_stochy_restart_intel' [01:20, 00:51](537 MB)
-PASS -- TEST 'control_lndp_intel' [02:15, 01:24](668 MB)
-PASS -- TEST 'control_iovr4_intel' [03:18, 02:11](659 MB)
-PASS -- TEST 'control_iovr5_intel' [03:17, 02:05](671 MB)
-PASS -- TEST 'control_p8_intel' [03:43, 02:34](1637 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [03:45, 02:41](1642 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [03:45, 02:36](1629 MB)
-PASS -- TEST 'control_restart_p8_intel' [02:48, 01:24](918 MB)
-PASS -- TEST 'control_noqr_p8_intel' [03:35, 02:34](1624 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [02:54, 01:22](990 MB)
-PASS -- TEST 'control_decomp_p8_intel' [03:34, 02:42](1621 MB)
-PASS -- TEST 'control_2threads_p8_intel' [03:34, 02:28](1732 MB)
-PASS -- TEST 'control_p8_lndp_intel' [05:27, 04:31](1632 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [04:50, 03:29](1718 MB)
-PASS -- TEST 'control_p8_mynn_intel' [03:42, 02:36](1644 MB)
-PASS -- TEST 'merra2_thompson_intel' [03:51, 02:57](1655 MB)
-PASS -- TEST 'regional_control_intel' [05:23, 04:38](959 MB)
-PASS -- TEST 'regional_restart_intel' [03:23, 02:29](1105 MB)
-PASS -- TEST 'regional_decomp_intel' [05:20, 04:40](945 MB)
-PASS -- TEST 'regional_2threads_intel' [03:20, 02:54](921 MB)
-PASS -- TEST 'regional_noquilt_intel' [05:22, 04:18](1489 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [05:25, 04:27](956 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [05:19, 04:32](958 MB)
-PASS -- TEST 'regional_wofs_intel' [06:21, 05:35](2102 MB)
-
-PASS -- COMPILE 'rrfs_intel' [08:06, 07:44]
-PASS -- TEST 'rap_control_intel' [07:43, 06:30](1198 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [04:39, 03:25](1421 MB)
-PASS -- TEST 'rap_decomp_intel' [07:37, 06:46](1164 MB)
-PASS -- TEST 'rap_2threads_intel' [07:37, 06:10](1357 MB)
-PASS -- TEST 'rap_restart_intel' [04:53, 03:32](1156 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [07:38, 06:32](1201 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [07:35, 06:57](1128 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [05:59, 04:57](1190 MB)
-PASS -- TEST 'hrrr_control_intel' [04:41, 03:23](1089 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [04:32, 03:26](1037 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [04:30, 03:06](1121 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [02:21, 01:55](1026 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [07:51, 06:20](1216 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [08:21, 07:43](2009 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [08:19, 07:27](2175 MB)
-
-PASS -- COMPILE 'csawmg_intel' [08:06, 07:37]
-PASS -- TEST 'control_csawmg_intel' [06:28, 05:24](801 MB)
-PASS -- TEST 'control_csawmgt_intel' [06:29, 05:22](806 MB)
-PASS -- TEST 'control_ras_intel' [03:14, 02:51](808 MB)
-
-PASS -- COMPILE 'csawmg_gnu' [05:06, 04:25]
-PASS -- TEST 'control_csawmg_gnu' [07:28, 06:31](810 MB)
-PASS -- TEST 'control_csawmgt_gnu' [07:23, 06:26](813 MB)
-
-PASS -- COMPILE 'wam_intel' [07:06, 06:59]
-PASS -- TEST 'control_wam_intel' [02:19, 01:51](793 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [11:06, 10:08]
-PASS -- TEST 'control_p8_faster_intel' [03:52, 02:19](1637 MB)
-PASS -- TEST 'regional_control_faster_intel' [05:22, 04:09](954 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [05:06, 04:08]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:15, 02:16](828 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:18, 02:14](826 MB)
-PASS -- TEST 'control_stochy_debug_intel' [03:13, 02:27](829 MB)
-PASS -- TEST 'control_lndp_debug_intel' [03:12, 02:15](825 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [04:21, 03:23](876 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [04:28, 03:21](874 MB)
-PASS -- TEST 'control_ras_debug_intel' [03:13, 02:16](841 MB)
-PASS -- TEST 'control_diag_debug_intel' [03:19, 02:18](880 MB)
-PASS -- TEST 'control_debug_p8_intel' [03:34, 02:21](1653 MB)
-PASS -- TEST 'regional_debug_intel' [17:29, 16:33](887 MB)
-PASS -- TEST 'rap_control_debug_intel' [04:17, 03:57](1210 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [04:14, 03:51](1221 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [04:13, 03:57](1220 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [04:13, 03:59](1226 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [04:18, 04:03](1221 MB)
-PASS -- TEST 'rap_diag_debug_intel' [05:27, 04:12](1293 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:13, 04:08](1222 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [05:13, 04:08](1215 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [04:13, 04:00](1214 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:14, 04:03](1213 MB)
-PASS -- TEST 'rap_noah_debug_intel' [04:13, 03:56](1215 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [05:14, 04:05](1226 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [07:13, 06:28](1210 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [04:12, 04:02](1209 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [05:12, 04:50](1217 MB)
-PASS -- TEST 'rap_flake_debug_intel' [04:12, 03:57](1214 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [07:47, 06:50](1219 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_gnu' [04:05, 03:48]
-PASS -- TEST 'control_csawmg_debug_gnu' [02:28, 01:52](787 MB)
-PASS -- TEST 'control_csawmgt_debug_gnu' [02:21, 01:46](788 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [03:05, 03:04]
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [08:06, 07:16]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [04:42, 03:20](1274 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [06:43, 05:25](1145 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [03:44, 02:54](1026 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [06:26, 05:10](1278 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [03:34, 02:44](1045 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [04:53, 03:05](985 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [09:49, 04:04](1091 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:23, 01:35](963 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [10:06, 09:54]
-PASS -- TEST 'conus13km_control_intel' [02:34, 01:48](1294 MB)
-PASS -- TEST 'conus13km_2threads_intel' [01:27, 00:43](1200 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [01:22, 01:00](1164 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [08:06, 07:32]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [04:26, 03:46](1089 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:06, 03:18]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [04:18, 03:55](1097 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [04:15, 03:51](1096 MB)
-PASS -- TEST 'conus13km_debug_intel' [12:31, 11:34](1328 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [12:27, 11:57](987 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [07:26, 06:38](1239 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [12:26, 11:31](1407 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [04:05, 03:28]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [04:16, 04:02](1147 MB)
-
-PASS -- COMPILE 'hafsw_intel' [11:06, 10:47]
-PASS -- TEST 'hafs_regional_atm_intel' [07:02, 05:18](878 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [06:15, 05:05](1277 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [08:08, 06:21](948 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [14:59, 13:59](988 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [16:16, 15:00](1019 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [06:48, 05:36](603 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [08:10, 06:59](616 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [03:39, 02:50](434 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [11:03, 08:11](545 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [09:45, 04:02](611 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [09:42, 03:51](617 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [06:42, 04:58](677 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [06:21, 01:31](452 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [04:06, 03:29]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [13:39, 11:24](633 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [12:06, 11:27]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [20:45, 17:13](727 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [18:51, 15:48](811 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [11:05, 10:11]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [13:53, 10:32](796 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [10:08, 09:56]
-PASS -- TEST 'hafs_regional_docn_intel' [11:00, 05:45](961 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [10:59, 05:39](953 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [21:41, 16:27](1336 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [07:05, 06:19]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [07:12, 02:10](1153 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [03:12, 01:22](1088 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [06:10, 02:05](1012 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [05:11, 02:06](1013 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:10, 02:07](1004 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [06:10, 02:10](1148 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [05:10, 02:16](1157 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [05:10, 02:10](1018 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [06:43, 05:00](1146 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [06:40, 04:54](1144 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [04:08, 02:13](1151 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:10, 03:03](2434 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [04:11, 03:05](2441 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [04:05, 03:24]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:12, 05:12](1077 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [06:05, 05:42]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:10, 02:09](1119 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [01:05, 00:42]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [03:22, 01:07](335 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [02:17, 00:57](560 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:16, 00:34](561 MB)
-
-PASS -- COMPILE 'atml_intel' [09:05, 08:24]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [08:06, 05:46](1646 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [09:03, 05:52](1650 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [04:35, 03:03](940 MB)
-
-PASS -- COMPILE 'atmw_intel' [11:07, 10:08]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:50, 01:40](1687 MB)
-
-PASS -- COMPILE 'atmwm_intel' [11:16, 10:19]
-PASS -- TEST 'control_atmwav_intel' [03:39, 01:39](693 MB)
-
-PASS -- COMPILE 'atmaero_intel' [08:05, 07:41]
-PASS -- TEST 'atmaero_control_p8_intel' [05:43, 03:39](1785 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [05:45, 04:24](1825 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [05:40, 04:34](1815 MB)
-
-PASS -- COMPILE 'atmaq_intel' [08:05, 07:08]
-
-PASS -- COMPILE 'atmaq_debug_intel' [04:05, 03:15]
-PASS -- TEST 'regional_atmaq_debug_intel' [19:22, 17:14](4574 MB)
-
-PASS -- COMPILE 'atm_gnu' [06:08, 05:45]
-PASS -- TEST 'control_c48_gnu' [10:26, 09:33](881 MB)
-PASS -- TEST 'control_stochy_gnu' [03:13, 02:15](730 MB)
-PASS -- TEST 'control_ras_gnu' [04:13, 03:41](732 MB)
-PASS -- TEST 'control_p8_gnu' [04:49, 03:38](1511 MB)
-PASS -- TEST 'control_p8_ugwpv1_gnu' [04:37, 03:31](1514 MB)
-PASS -- TEST 'control_flake_gnu' [05:12, 04:22](806 MB)
-
-PASS -- COMPILE 'rrfs_gnu' [05:05, 04:22]
-PASS -- TEST 'rap_control_gnu' [09:44, 07:45](1090 MB)
-PASS -- TEST 'rap_decomp_gnu' [09:32, 07:42](1086 MB)
-PASS -- TEST 'rap_2threads_gnu' [09:31, 07:18](1128 MB)
-PASS -- TEST 'rap_restart_gnu' [05:41, 04:07](885 MB)
-PASS -- TEST 'rap_sfcdiff_gnu' [09:34, 07:41](1087 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_gnu' [09:34, 07:54](1089 MB)
-PASS -- TEST 'rap_sfcdiff_restart_gnu' [06:37, 05:52](885 MB)
-PASS -- TEST 'hrrr_control_gnu' [06:29, 04:02](1076 MB)
-PASS -- TEST 'hrrr_control_noqr_gnu' [05:44, 04:02](1139 MB)
-PASS -- TEST 'hrrr_control_2threads_gnu' [05:31, 03:36](1042 MB)
-PASS -- TEST 'hrrr_control_decomp_gnu' [05:29, 03:58](1077 MB)
-PASS -- TEST 'hrrr_control_restart_gnu' [04:23, 02:07](879 MB)
-PASS -- TEST 'hrrr_control_restart_noqr_gnu' [04:25, 02:07](932 MB)
-PASS -- TEST 'rrfs_v1beta_gnu' [08:48, 07:43](1085 MB)
-
-PASS -- COMPILE 'atm_dyn32_debug_gnu' [07:06, 06:38]
-PASS -- TEST 'control_diag_debug_gnu' [02:19, 01:15](775 MB)
-PASS -- TEST 'regional_debug_gnu' [07:26, 06:26](923 MB)
-PASS -- TEST 'rap_control_debug_gnu' [03:14, 02:01](1101 MB)
-PASS -- TEST 'hrrr_control_debug_gnu' [02:14, 01:57](1088 MB)
-PASS -- TEST 'hrrr_gf_debug_gnu' [02:11, 02:01](1098 MB)
-PASS -- TEST 'hrrr_c3_debug_gnu' [02:12, 02:01](1096 MB)
-PASS -- TEST 'rap_diag_debug_gnu' [03:21, 02:05](1270 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_gnu' [04:12, 03:10](1096 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_gnu' [02:13, 01:59](1097 MB)
-PASS -- TEST 'rrfs_v1beta_debug_gnu' [02:14, 01:59](1093 MB)
-PASS -- TEST 'control_ras_debug_gnu' [02:13, 01:14](727 MB)
-PASS -- TEST 'control_stochy_debug_gnu' [02:12, 01:16](725 MB)
-PASS -- TEST 'control_debug_p8_gnu' [02:29, 01:16](1505 MB)
-PASS -- TEST 'rap_flake_debug_gnu' [02:13, 01:58](1099 MB)
-PASS -- TEST 'rap_clm_lake_debug_gnu' [03:12, 02:16](1099 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_gnu' [04:43, 03:20](1103 MB)
-
-PASS -- COMPILE 'wam_debug_gnu' [03:06, 02:58]
-PASS -- TEST 'control_wam_debug_gnu' [02:18, 02:00](501 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_gnu' [06:06, 05:32]
-PASS -- TEST 'rap_control_dyn32_phy32_gnu' [08:42, 07:21](962 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_gnu' [04:52, 03:54](959 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_gnu' [08:30, 07:00](968 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_gnu' [04:34, 03:33](873 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_gnu' [05:34, 03:54](953 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_gnu' [06:44, 05:29](860 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_gnu' [03:19, 02:07](856 MB)
-PASS -- TEST 'conus13km_control_gnu' [04:35, 02:43](1266 MB)
-PASS -- TEST 'conus13km_2threads_gnu' [02:21, 01:10](1172 MB)
-PASS -- TEST 'conus13km_restart_mismatch_gnu' [02:22, 01:40](948 MB)
-
-PASS -- COMPILE 'atm_dyn64_phy32_gnu' [09:05, 08:47]
-PASS -- TEST 'rap_control_dyn64_phy32_gnu' [05:27, 04:28](989 MB)
-
-PASS -- COMPILE 'atm_dyn32_phy32_debug_gnu' [12:05, 11:39]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_gnu' [03:13, 01:59](978 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_gnu' [04:13, 02:01](969 MB)
-PASS -- TEST 'conus13km_debug_gnu' [07:27, 05:36](1282 MB)
-PASS -- TEST 'conus13km_debug_qr_gnu' [07:27, 05:47](963 MB)
-PASS -- TEST 'conus13km_debug_2threads_gnu' [04:22, 03:18](1191 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_gnu' [07:22, 05:33](1350 MB)
-
-PASS -- COMPILE 'atm_dyn64_phy32_debug_gnu' [13:05, 12:07]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_gnu' [03:13, 02:01](1003 MB)
-
-PASS -- COMPILE 's2swa_gnu' [17:05, 16:14]
-
-PASS -- COMPILE 's2s_gnu' [17:07, 16:10]
-
-PASS -- COMPILE 's2swa_debug_gnu' [13:06, 12:15]
-
-PASS -- COMPILE 's2sw_pdlib_gnu' [17:06, 16:57]
-
-PASS -- COMPILE 's2sw_pdlib_debug_gnu' [12:07, 11:13]
-
-PASS -- COMPILE 'datm_cdeps_gnu' [18:05, 17:47]
+PASS -- COMPILE 's2swa_32bit_intel' [12:10, 12:09]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:56, 07:29](1894 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [17:10, 16:14]
+PASS -- TEST 'cpld_control_gfsv17_intel' [15:08, 13:31](1767 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [15:25, 14:03](2190 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [08:11, 06:20](1175 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [15:54, 15:07](1691 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [06:10, 05:51]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [22:07, 20:22](1725 MB)
+
+PASS -- COMPILE 's2swa_intel' [11:10, 10:45]
+PASS -- TEST 'cpld_control_p8_intel' [08:52, 07:30](2086 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [08:58, 07:27](2077 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [06:09, 04:15](1955 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [08:50, 07:40](1979 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [06:11, 04:18](1733 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [09:47, 08:51](2498 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [08:47, 07:45](2070 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [07:54, 06:14](1900 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [08:59, 07:26](2069 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [16:34, 14:53](2799 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [08:06, 05:37](2920 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [13:43, 08:20](3632 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [12:42, 05:10](3627 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [05:53, 04:52](2019 MB)
+
+PASS -- COMPILE 's2sw_intel' [12:10, 11:18]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [07:46, 07:07](1773 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [04:53, 03:56](1814 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [05:10, 04:33]
+PASS -- TEST 'cpld_debug_p8_intel' [08:02, 06:55](2039 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [06:10, 05:25]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [05:45, 04:44](1790 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [10:10, 09:30]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [04:47, 03:57](1815 MB)
+
+PASS -- COMPILE 's2s_intel' [10:10, 09:35]
+PASS -- TEST 'cpld_control_c48_intel' [08:37, 07:17](2833 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [13:10, 12:53]
+PASS -- TEST 'cpld_control_p8_faster_intel' [08:58, 07:19](2055 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [15:10, 15:06]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [14:47, 13:43](1812 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [08:01, 06:42](1304 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [16:56, 15:13](1726 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [05:10, 04:12]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [22:50, 21:40](1763 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [08:10, 08:07]
+PASS -- TEST 'control_flake_intel' [03:18, 02:50](716 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [03:31, 02:28](1610 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [03:35, 02:32](1621 MB)
+PASS -- TEST 'control_latlon_intel' [03:30, 02:30](1611 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:36, 02:31](1615 MB)
+PASS -- TEST 'control_c48_intel' [07:32, 06:59](1749 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [06:22, 05:42](844 MB)
+PASS -- TEST 'control_c192_intel' [09:39, 08:55](1761 MB)
+PASS -- TEST 'control_c384_intel' [10:14, 09:07](2038 MB)
+PASS -- TEST 'control_c384gdas_intel' [09:41, 06:59](1530 MB)
+PASS -- TEST 'control_stochy_intel' [02:18, 01:24](671 MB)
+PASS -- TEST 'control_stochy_restart_intel' [01:27, 00:52](549 MB)
+PASS -- TEST 'control_lndp_intel' [02:18, 01:19](667 MB)
+PASS -- TEST 'control_iovr4_intel' [03:19, 02:05](659 MB)
+PASS -- TEST 'control_iovr5_intel' [02:23, 02:06](672 MB)
+PASS -- TEST 'control_p8_intel' [03:49, 02:31](1650 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [03:50, 02:31](1638 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [03:49, 02:26](1649 MB)
+PASS -- TEST 'control_restart_p8_intel' [02:44, 01:22](908 MB)
+PASS -- TEST 'control_noqr_p8_intel' [03:40, 02:28](1631 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [02:49, 01:21](991 MB)
+PASS -- TEST 'control_decomp_p8_intel' [03:38, 02:35](1634 MB)
+PASS -- TEST 'control_2threads_p8_intel' [03:38, 02:18](1728 MB)
+PASS -- TEST 'control_p8_lndp_intel' [05:31, 04:21](1629 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [04:48, 03:25](1718 MB)
+PASS -- TEST 'control_p8_mynn_intel' [03:47, 02:31](1646 MB)
+PASS -- TEST 'merra2_thompson_intel' [03:53, 02:45](1653 MB)
+PASS -- TEST 'regional_control_intel' [05:28, 04:31](956 MB)
+PASS -- TEST 'regional_restart_intel' [03:27, 02:26](1101 MB)
+PASS -- TEST 'regional_decomp_intel' [05:27, 04:45](949 MB)
+PASS -- TEST 'regional_2threads_intel' [03:27, 02:47](912 MB)
+PASS -- TEST 'regional_noquilt_intel' [05:29, 04:17](1484 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [05:30, 04:24](959 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [05:24, 04:25](959 MB)
+PASS -- TEST 'regional_wofs_intel' [06:26, 05:29](2070 MB)
+
+PASS -- COMPILE 'rrfs_intel' [08:10, 07:14]
+PASS -- TEST 'rap_control_intel' [07:32, 06:31](1208 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [04:46, 03:22](1402 MB)
+PASS -- TEST 'rap_decomp_intel' [07:31, 06:47](1141 MB)
+PASS -- TEST 'rap_2threads_intel' [06:46, 06:07](1352 MB)
+PASS -- TEST 'rap_restart_intel' [04:41, 03:26](1148 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [07:46, 06:26](1196 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [07:35, 06:45](1132 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [05:53, 04:54](1193 MB)
+PASS -- TEST 'hrrr_control_intel' [04:34, 03:19](1068 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [04:34, 03:23](1054 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [03:46, 03:01](1124 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [02:33, 01:48](1037 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [07:51, 06:19](1195 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [08:18, 07:48](2012 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [08:19, 07:29](2166 MB)
+
+PASS -- COMPILE 'csawmg_intel' [07:10, 07:03]
+PASS -- TEST 'control_csawmg_intel' [06:27, 05:15](805 MB)
+PASS -- TEST 'control_ras_intel' [03:18, 02:48](804 MB)
+
+PASS -- COMPILE 'csawmg_gnu' [04:10, 03:58]
+PASS -- TEST 'control_csawmg_gnu' [07:27, 06:28](812 MB)
+
+PASS -- COMPILE 'wam_intel' [07:10, 06:35]
+PASS -- TEST 'control_wam_intel' [02:25, 01:47](786 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [10:10, 09:17]
+PASS -- TEST 'control_p8_faster_intel' [03:50, 02:14](1628 MB)
+PASS -- TEST 'regional_control_faster_intel' [04:26, 04:06](960 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [04:10, 03:45]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:28, 02:09](1638 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [02:32, 02:08](1627 MB)
+PASS -- TEST 'control_stochy_debug_intel' [03:16, 02:28](823 MB)
+PASS -- TEST 'control_lndp_debug_intel' [03:16, 02:13](820 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [04:25, 03:24](878 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:16, 02:14](835 MB)
+PASS -- TEST 'control_diag_debug_intel' [03:34, 02:13](1682 MB)
+PASS -- TEST 'control_debug_p8_intel' [03:30, 02:19](1662 MB)
+PASS -- TEST 'regional_debug_intel' [14:27, 13:56](895 MB)
+PASS -- TEST 'rap_control_debug_intel' [04:18, 03:59](1216 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [04:17, 03:47](1210 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [04:17, 03:55](1221 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [04:17, 03:57](1226 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [04:16, 03:54](1227 MB)
+PASS -- TEST 'rap_diag_debug_intel' [05:25, 04:10](1304 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [04:17, 04:03](1216 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [04:17, 03:58](1215 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [04:18, 04:01](1220 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [04:18, 03:56](1217 MB)
+PASS -- TEST 'rap_noah_debug_intel' [04:17, 03:53](1210 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [04:17, 03:59](1223 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [07:18, 06:17](1211 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [04:19, 03:52](1215 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [05:20, 04:48](1230 MB)
+PASS -- TEST 'rap_flake_debug_intel' [04:19, 03:59](1224 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [07:49, 06:49](1222 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_gnu' [04:10, 03:10]
+PASS -- TEST 'control_csawmg_debug_gnu' [02:27, 01:41](793 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [03:10, 02:47]
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [07:11, 06:31]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [04:50, 03:21](1284 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [06:31, 05:21](1170 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [03:55, 02:52](1036 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [05:42, 05:01](1288 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [03:35, 02:35](1046 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [03:34, 02:59](978 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [04:40, 04:02](1094 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:24, 01:34](962 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [09:11, 08:51]
+PASS -- TEST 'conus13km_control_intel' [02:35, 01:40](1302 MB)
+PASS -- TEST 'conus13km_2threads_intel' [01:29, 00:45](1200 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [01:26, 01:03](1145 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [07:11, 06:43]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [04:27, 03:40](1096 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [03:10, 03:01]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [04:17, 03:54](1102 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [04:17, 03:48](1088 MB)
+PASS -- TEST 'conus13km_debug_intel' [12:30, 11:25](1333 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [12:31, 11:42](995 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [07:29, 06:31](1239 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [12:30, 11:30](1404 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [03:11, 03:01]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [04:18, 03:57](1149 MB)
+
+PASS -- COMPILE 'hafsw_intel' [11:11, 10:11]
+PASS -- TEST 'hafs_regional_atm_intel' [07:03, 05:16](880 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [05:20, 04:49](1273 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [08:11, 06:17](953 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [15:01, 13:47](980 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [17:15, 15:14](1003 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [06:46, 05:17](604 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [08:18, 06:44](614 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [03:40, 02:48](435 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [09:56, 07:28](543 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [04:38, 03:43](615 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [04:39, 03:33](614 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [05:43, 04:40](684 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:25, 01:23](453 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [03:11, 02:53]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [12:39, 11:10](627 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [11:11, 10:12]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [17:47, 16:25](764 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [16:52, 15:57](842 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [11:11, 10:19]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [10:51, 09:44](835 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [10:11, 10:03]
+PASS -- TEST 'hafs_regional_docn_intel' [07:05, 05:18](945 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [07:03, 05:24](932 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [17:49, 16:26](1346 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [05:11, 04:40]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:15, 02:08](1150 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:15, 01:17](1101 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:13, 02:05](1013 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:15, 02:04](1007 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [02:14, 02:06](1010 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [02:14, 02:06](1156 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [02:14, 02:06](1154 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [02:13, 02:01](1010 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [05:49, 04:52](1157 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [05:45, 04:48](1143 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [02:12, 02:06](1150 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [03:14, 02:59](2388 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [03:15, 03:01](2380 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [03:10, 03:00]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:14, 05:10](1077 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [06:10, 05:57]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [02:14, 02:07](1155 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [01:10, 00:45]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [01:24, 00:58](329 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [01:21, 00:52](561 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:20, 00:29](556 MB)
+
+PASS -- COMPILE 'atml_intel' [08:10, 07:47]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [07:01, 05:28](1638 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [06:56, 05:16](1648 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [03:38, 02:59](951 MB)
+
+PASS -- COMPILE 'atmw_intel' [10:10, 09:15]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [02:46, 01:31](1686 MB)
+
+PASS -- COMPILE 'atmaero_intel' [08:10, 07:16]
+PASS -- TEST 'atmaero_control_p8_intel' [04:48, 03:28](1797 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [05:46, 04:07](1799 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [05:39, 04:12](1832 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [03:10, 02:41]
+PASS -- TEST 'regional_atmaq_debug_intel' [18:14, 16:14](4603 MB)
+
+PASS -- COMPILE 'atm_gnu' [04:10, 03:46]
+PASS -- TEST 'control_c48_gnu' [10:35, 09:22](1558 MB)
+PASS -- TEST 'control_stochy_gnu' [03:17, 02:12](733 MB)
+PASS -- TEST 'control_ras_gnu' [04:16, 03:38](737 MB)
+PASS -- TEST 'control_p8_gnu' [04:45, 03:29](1516 MB)
+PASS -- TEST 'control_p8_ugwpv1_gnu' [04:37, 03:24](1514 MB)
+PASS -- TEST 'control_flake_gnu' [05:17, 04:18](800 MB)
+
+PASS -- COMPILE 'rrfs_gnu' [07:10, 06:32]
+PASS -- TEST 'rap_control_gnu' [08:30, 07:30](1090 MB)
+PASS -- TEST 'rap_decomp_gnu' [08:30, 07:42](1088 MB)
+PASS -- TEST 'rap_2threads_gnu' [07:45, 07:00](1128 MB)
+PASS -- TEST 'rap_restart_gnu' [04:41, 03:53](886 MB)
+PASS -- TEST 'rap_sfcdiff_gnu' [08:36, 07:33](1087 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_gnu' [08:34, 07:44](1086 MB)
+PASS -- TEST 'rap_sfcdiff_restart_gnu' [06:39, 05:43](885 MB)
+PASS -- TEST 'hrrr_control_gnu' [04:44, 03:57](1075 MB)
+PASS -- TEST 'hrrr_control_noqr_gnu' [04:33, 03:55](1136 MB)
+PASS -- TEST 'hrrr_control_2threads_gnu' [04:31, 03:30](1027 MB)
+PASS -- TEST 'hrrr_control_decomp_gnu' [04:31, 03:53](1080 MB)
+PASS -- TEST 'hrrr_control_restart_gnu' [02:19, 02:02](881 MB)
+PASS -- TEST 'hrrr_control_restart_noqr_gnu' [02:19, 02:01](933 MB)
+PASS -- TEST 'rrfs_v1beta_gnu' [08:52, 07:30](1084 MB)
+
+PASS -- COMPILE 'atm_dyn32_debug_gnu' [10:11, 09:50]
+PASS -- TEST 'control_diag_debug_gnu' [01:33, 01:09](1628 MB)
+PASS -- TEST 'regional_debug_gnu' [07:28, 06:20](923 MB)
+PASS -- TEST 'rap_control_debug_gnu' [02:17, 01:58](1097 MB)
+PASS -- TEST 'hrrr_control_debug_gnu' [02:18, 01:56](1087 MB)
+PASS -- TEST 'hrrr_gf_debug_gnu' [02:17, 01:56](1094 MB)
+PASS -- TEST 'hrrr_c3_debug_gnu' [02:22, 01:58](1094 MB)
+PASS -- TEST 'rap_diag_debug_gnu' [02:24, 02:04](1268 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_gnu' [03:17, 03:04](1093 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_gnu' [02:17, 01:55](1095 MB)
+PASS -- TEST 'rrfs_v1beta_debug_gnu' [02:16, 01:57](1092 MB)
+PASS -- TEST 'control_ras_debug_gnu' [02:16, 01:08](724 MB)
+PASS -- TEST 'control_stochy_debug_gnu' [02:16, 01:16](722 MB)
+PASS -- TEST 'control_debug_p8_gnu' [02:31, 01:15](1501 MB)
+PASS -- TEST 'rap_flake_debug_gnu' [02:17, 01:56](1096 MB)
+PASS -- TEST 'rap_clm_lake_debug_gnu' [02:18, 02:08](1098 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_gnu' [04:52, 03:13](1095 MB)
+
+PASS -- COMPILE 'wam_debug_gnu' [06:11, 05:10]
+PASS -- TEST 'control_wam_debug_gnu' [02:22, 01:52](499 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_gnu' [08:11, 07:25]
+PASS -- TEST 'rap_control_dyn32_phy32_gnu' [08:32, 07:10](964 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_gnu' [04:43, 03:43](951 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_gnu' [07:41, 06:36](978 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_gnu' [04:36, 03:24](881 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_gnu' [04:35, 03:51](950 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_gnu' [06:40, 05:21](859 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_gnu' [02:21, 01:57](856 MB)
+PASS -- TEST 'conus13km_control_gnu' [03:36, 02:32](1264 MB)
+PASS -- TEST 'conus13km_2threads_gnu' [01:28, 01:05](1174 MB)
+PASS -- TEST 'conus13km_restart_mismatch_gnu' [02:27, 01:25](944 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_gnu' [08:11, 07:42]
+PASS -- TEST 'rap_control_dyn64_phy32_gnu' [05:28, 04:21](987 MB)
+
+PASS -- COMPILE 'atm_dyn32_phy32_debug_gnu' [11:11, 10:58]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_gnu' [02:17, 01:55](974 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_gnu' [02:18, 01:51](972 MB)
+PASS -- TEST 'conus13km_debug_gnu' [07:35, 05:35](1278 MB)
+PASS -- TEST 'conus13km_debug_qr_gnu' [07:30, 05:32](953 MB)
+PASS -- TEST 'conus13km_debug_2threads_gnu' [04:26, 03:10](1185 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_gnu' [06:26, 05:27](1347 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_debug_gnu' [12:11, 11:57]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_gnu' [03:18, 01:59](1000 MB)
+
+PASS -- COMPILE 's2swa_gnu' [17:11, 16:24]
+
+PASS -- COMPILE 's2s_gnu' [17:11, 16:48]
+
+PASS -- COMPILE 's2swa_debug_gnu' [11:10, 10:37]
+
+PASS -- COMPILE 's2sw_pdlib_gnu' [17:10, 16:48]
+
+PASS -- COMPILE 's2sw_pdlib_debug_gnu' [10:10, 09:17]
+
+PASS -- COMPILE 'datm_cdeps_gnu' [14:11, 13:42]
 
 SYNOPSIS:
-Starting Date/Time: 20240415 18:42:06
-Ending Date/Time: 20240415 19:56:08
-Total Time: 01h:14m:28s
-Compiles Completed: 55/55
-Tests Completed: 239/239
+Starting Date/Time: 20240425 07:05:44
+Ending Date/Time: 20240425 08:15:15
+Total Time: 01h:09m:54s
+Compiles Completed: 53/53
+Tests Completed: 234/234
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
index 2f7f41cd46..2055263dc5 100644
--- a/tests/logs/RegressionTests_jet.log
+++ b/tests/logs/RegressionTests_jet.log
@@ -1,7 +1,7 @@
 ====START OF JET REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-684ddd65adbf26b3a8003e05c8af6c4e19be63f8
+59efb751087aed49bf96c2f722ba7013cbe33785
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,22 +11,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,247 +35,318 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /mnt/lfs4/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /lfs4/HFIP/h-nems/Fernando.Andrade-maldonado/RT_RUNDIRS/Fernando.Andrade-maldonado/FV3_RT/rt_3732077
+BASELINE DIRECTORY: /mnt/lfs4/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs4/HFIP/h-nems/Zachary.Shrader/RT_RUNDIRS/Zachary.Shrader/FV3_RT/rt_4037119
+
+RT.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: h-nems
+* (-l) - USE CONFIG FILE: rt.conf
+* (-r) - USE ROCOTO
+
+PASS -- COMPILE 's2swa_32bit_intel' [38:58, 38:57]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:16, 06:54](1772 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [48:05, 48:04]
+PASS -- TEST 'cpld_control_gfsv17_intel' [22:34, 20:51](1656 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [24:16, 22:28](1871 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [12:14, 10:26](993 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [25:41, 23:57](1618 MB)
+
+PASS -- COMPILE 's2swa_intel' [38:54, 38:53]
+PASS -- TEST 'cpld_control_p8_intel' [08:51, 07:30](1831 MB)
+FAILED: TEST TIMED OUT -- TEST 'cpld_control_p8.v2.sfc_intel' [, ]( MB)
+PASS -- TEST 'cpld_restart_p8_intel' [05:51, 04:24](1711 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [09:08, 07:43](1825 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [06:05, 04:31](1733 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [08:27, 07:11](2265 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [08:54, 07:36](1813 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [07:46, 06:25](1773 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [08:58, 07:37](1813 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [08:33, 07:16](1753 MB)
+
+PASS -- COMPILE 's2sw_intel' [36:24, 36:23]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [06:56, 05:52](1669 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [07:01, 05:44](1710 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [05:15, 05:14]
+PASS -- TEST 'cpld_debug_p8_intel' [11:55, 10:36](1846 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [04:51, 04:50]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [08:24, 07:16](1651 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [32:13, 32:12]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [07:04, 05:44](1707 MB)
+
+PASS -- COMPILE 's2s_intel' [32:46, 32:46]
+PASS -- TEST 'cpld_control_c48_intel' [13:29, 12:45](2799 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [34:23, 34:22]
+PASS -- TEST 'cpld_control_p8_faster_intel' [08:40, 07:14](1821 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [53:05, 53:05]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [22:01, 20:51](1669 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [11:51, 10:31](1024 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [23:01, 21:54](1646 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [05:03, 05:02]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [33:16, 32:11](1682 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [35:04, 35:04]
+PASS -- TEST 'control_flake_intel' [04:46, 04:29](646 MB)
+FAILED: TEST TIMED OUT -- TEST 'control_CubedSphereGrid_intel' [, ]( MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [04:45, 04:00](1541 MB)
+PASS -- TEST 'control_latlon_intel' [04:27, 03:51](1529 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [04:51, 04:07](1529 MB)
+PASS -- TEST 'control_c48_intel' [12:32, 11:54](1718 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [10:27, 10:08](848 MB)
+PASS -- TEST 'control_c192_intel' [15:17, 14:18](1678 MB)
+PASS -- TEST 'control_c384_intel' [19:48, 18:10](1826 MB)
+PASS -- TEST 'control_c384gdas_intel' [16:16, 13:36](1001 MB)
+PASS -- TEST 'control_stochy_intel' [02:27, 02:11](602 MB)
+PASS -- TEST 'control_stochy_restart_intel' [01:34, 01:19](434 MB)
+PASS -- TEST 'control_lndp_intel' [02:23, 02:07](602 MB)
+PASS -- TEST 'control_iovr4_intel' [03:31, 03:17](595 MB)
+PASS -- TEST 'control_iovr5_intel' [03:31, 03:17](603 MB)
+PASS -- TEST 'control_p8_intel' [05:11, 04:05](1549 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [05:05, 04:00](1579 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [05:13, 03:53](1574 MB)
+PASS -- TEST 'control_restart_p8_intel' [03:09, 02:13](808 MB)
+PASS -- TEST 'control_noqr_p8_intel' [05:01, 03:53](1564 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [03:15, 02:07](849 MB)
+PASS -- TEST 'control_decomp_p8_intel' [05:03, 04:02](1563 MB)
+PASS -- TEST 'control_2threads_p8_intel' [04:54, 03:46](1651 MB)
+PASS -- TEST 'control_p8_lndp_intel' [07:40, 07:02](1573 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [06:47, 05:29](1608 MB)
+PASS -- TEST 'control_p8_mynn_intel' [05:18, 04:05](1572 MB)
+PASS -- TEST 'merra2_thompson_intel' [05:45, 04:19](1581 MB)
+PASS -- TEST 'regional_control_intel' [07:44, 07:09](758 MB)
+PASS -- TEST 'regional_restart_intel' [04:14, 03:48](930 MB)
+PASS -- TEST 'regional_decomp_intel' [08:08, 07:33](759 MB)
+PASS -- TEST 'regional_2threads_intel' [05:06, 04:31](757 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [07:46, 07:04](761 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [07:40, 07:04](761 MB)
+
+PASS -- COMPILE 'rrfs_intel' [32:59, 32:58]
+PASS -- TEST 'rap_control_intel' [11:08, 10:04](991 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [06:32, 05:35](1214 MB)
+PASS -- TEST 'rap_decomp_intel' [11:41, 10:35](989 MB)
+PASS -- TEST 'rap_2threads_intel' [10:43, 09:38](1071 MB)
+PASS -- TEST 'rap_restart_intel' [05:56, 05:17](993 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [11:03, 10:01](991 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [11:45, 10:42](987 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [08:17, 07:39](999 MB)
+PASS -- TEST 'hrrr_control_intel' [06:19, 05:09](973 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [06:20, 05:13](980 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [05:48, 04:42](1065 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [03:13, 02:55](910 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [11:03, 09:57](989 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [12:38, 12:21](1944 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [12:22, 12:08](1921 MB)
+
+PASS -- COMPILE 'csawmg_intel' [31:27, 31:27]
+PASS -- TEST 'control_csawmg_intel' [08:36, 08:06](693 MB)
+PASS -- TEST 'control_ras_intel' [04:36, 04:24](667 MB)
+
+PASS -- COMPILE 'wam_intel' [29:55, 29:55]
+PASS -- TEST 'control_wam_intel' [03:01, 02:50](497 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [31:50, 31:49]
+PASS -- TEST 'control_p8_faster_intel' [04:52, 03:38](1568 MB)
+PASS -- TEST 'regional_control_faster_intel' [07:10, 06:36](769 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [05:58, 05:58]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:55, 03:19](1564 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:58, 03:16](1565 MB)
+PASS -- TEST 'control_stochy_debug_intel' [04:03, 03:46](760 MB)
+PASS -- TEST 'control_lndp_debug_intel' [03:38, 03:24](769 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [05:48, 05:17](811 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:45, 03:28](770 MB)
+PASS -- TEST 'control_diag_debug_intel' [04:23, 03:44](1607 MB)
+PASS -- TEST 'control_debug_p8_intel' [04:31, 03:53](1599 MB)
+PASS -- TEST 'regional_debug_intel' [23:12, 22:35](783 MB)
+PASS -- TEST 'rap_control_debug_intel' [06:24, 06:07](1156 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [06:08, 05:55](1151 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [06:21, 06:04](1149 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [06:21, 06:06](1157 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:21, 06:05](1160 MB)
+PASS -- TEST 'rap_diag_debug_intel' [06:41, 06:19](1236 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [06:25, 06:13](1151 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [06:26, 06:14](1151 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [06:20, 06:07](1153 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [06:28, 06:12](1160 MB)
+PASS -- TEST 'rap_noah_debug_intel' [06:18, 06:03](1144 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [06:24, 06:09](1150 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [10:12, 10:01](1153 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [06:13, 06:00](1151 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [07:36, 07:22](1151 MB)
+PASS -- TEST 'rap_flake_debug_intel' [06:21, 06:04](1147 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [11:40, 10:30](1157 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [04:00, 04:00]
+PASS -- TEST 'control_wam_debug_intel' [06:22, 06:10](445 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [30:01, 30:00]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [06:10, 05:14](1071 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [09:20, 08:19](901 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [05:53, 04:29](862 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [08:54, 07:52](957 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [05:32, 04:06](911 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [06:08, 04:42](853 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [06:48, 06:14](902 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:38, 02:23](848 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [42:46, 42:46]
+PASS -- TEST 'conus13km_control_intel' [03:43, 03:01](1104 MB)
+PASS -- TEST 'conus13km_2threads_intel' [02:04, 01:27](1054 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [02:14, 01:38](1022 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [30:43, 30:42]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [06:06, 05:33](911 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:19, 04:19]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [06:13, 06:00](1029 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [06:10, 05:54](1031 MB)
+PASS -- TEST 'conus13km_debug_intel' [19:09, 18:30](1121 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [19:12, 18:33](884 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [11:16, 10:41](1066 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [18:57, 18:22](1205 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [04:11, 04:11]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:17, 06:05](1067 MB)
+
+PASS -- COMPILE 'hafsw_intel' [34:28, 34:28]
+PASS -- TEST 'hafs_regional_atm_intel' [08:15, 07:01](717 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [06:54, 06:31](1094 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [10:41, 09:13](776 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [17:56, 16:15](801 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [19:43, 18:12](821 MB)
+PASS -- TEST 'gnv1_nested_intel' [06:36, 05:43](773 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [32:14, 32:14]
+PASS -- TEST 'hafs_regional_docn_intel' [09:58, 08:43](767 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [10:12, 08:46](756 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [08:07, 08:07]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:45, 03:35](1077 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:26, 02:13](1039 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:43, 03:34](925 MB)
+FAILED: TEST TIMED OUT -- TEST 'datm_cdeps_iau_gefs_intel' [, ]( MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [03:52, 03:41](931 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:54, 03:43](1064 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [03:42, 03:34](1056 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:45, 03:34](927 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [08:54, 07:54](881 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [08:48, 07:51](842 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:41, 03:34](1063 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:11, 05:01](2408 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [05:57, 05:44](2391 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [03:19, 03:19]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [08:20, 08:10](1008 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [08:18, 08:17]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:41, 03:32](1072 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [01:55, 01:55]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [02:01, 01:36](233 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [01:37, 01:19](256 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:12, 00:55](256 MB)
+
+PASS -- COMPILE 'atml_intel' [39:04, 39:03]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [09:05, 07:42](1597 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [09:05, 07:42](1593 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [04:36, 03:59](863 MB)
+
+PASS -- COMPILE 'atmw_intel' [31:47, 31:46]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:27, 02:16](1600 MB)
+
+PASS -- COMPILE 'atmaero_intel' [30:44, 30:44]
+PASS -- TEST 'atmaero_control_p8_intel' [06:30, 05:22](1674 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [07:31, 06:23](1706 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [07:20, 06:28](1732 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20240424 18:28:23
+Ending Date/Time: 20240425 00:58:46
+Total Time: 06h:30m:55s
+Compiles Completed: 32/32
+Tests Completed: 155/158
+Failed Tests:
+* TEST cpld_control_p8.v2.sfc_intel: FAILED: TEST TIMED OUT
+-- LOG: /mnt/lfs4/HFIP/hfv3gfs/Zachary.Shrader/rt-2241/tests/logs/log_jet/run_cpld_control_p8.v2.sfc_intel.log
+* TEST control_CubedSphereGrid_intel: FAILED: TEST TIMED OUT
+-- LOG: /mnt/lfs4/HFIP/hfv3gfs/Zachary.Shrader/rt-2241/tests/logs/log_jet/run_control_CubedSphereGrid_intel.log
+* TEST datm_cdeps_iau_gefs_intel: FAILED: TEST TIMED OUT
+-- LOG: /mnt/lfs4/HFIP/hfv3gfs/Zachary.Shrader/rt-2241/tests/logs/log_jet/run_datm_cdeps_iau_gefs_intel.log
+
+NOTES:
+A file 'test_changes.list' was generated with list of all failed tests.
+You can use './rt.sh -c -b test_changes.list' to create baselines for the failed tests.
+If you are using this log as a pull request verification, please commit 'test_changes.list'.
+
+Result: FAILURE
+
+====END OF JET REGRESSION TESTING LOG====
+====START OF JET REGRESSION TESTING LOG====
+
+UFSWM hash used in testing:
+59efb751087aed49bf96c2f722ba7013cbe33785
+
+Submodule hashes used in testing:
+ 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
+ be5d28fd1b60522e6fc98aefeead20e6aac3530b AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
+ 3d7067a523b8557058755289e4275f5f5c985daf CDEPS-interface/CDEPS (cdeps0.4.17-40-g3d7067a)
+ c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 CICE-interface/CICE (CICE6.0.0-447-gc9e4679)
+ f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
+ 4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
+ cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
+ 011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
+ 9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
+-1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+ 041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
+ 35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
+ 9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+ 6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
+ d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
+
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /mnt/lfs4/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs4/HFIP/h-nems/Zachary.Shrader/RT_RUNDIRS/Zachary.Shrader/FV3_RT/rt_3617777
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: h-nems
 * (-l) - USE CONFIG FILE: rt.conf
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [39:09, 38:13]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [34:43, 06:59](1795 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [48:09, 47:30]
-PASS -- TEST 'cpld_control_gfsv17_intel' [21:35, 20:47](1664 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [59:24, 22:19](1892 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [47:58, 10:20](996 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [00:54, 23:54](1629 MB)
-
-PASS -- COMPILE 's2swa_intel' [18:12, 38:37]
-PASS -- TEST 'cpld_control_p8_intel' [45:42, 07:28](1831 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [53:05, 07:26](1825 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [53:54, 04:29](1716 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [20:44, 07:38](1841 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [16:31, 04:41](1726 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [05:52, 07:05](2277 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [29:36, 07:38](1823 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [12:35, 06:19](1774 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [38:01, 07:27](1834 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [59:55, 07:03](1796 MB)
-
-PASS -- COMPILE 's2sw_intel' [36:08, 35:07]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [23:43, 05:51](1668 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [29:54, 05:42](1713 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [41:09, 05:02]
-PASS -- TEST 'cpld_debug_p8_intel' [43:47, 10:28](1843 MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [12:07, 04:50]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [28:28, 07:12](1680 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [41:10, 32:02]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [04:05, 05:45](1717 MB)
-
-PASS -- COMPILE 's2s_intel' [56:11, 32:30]
-PASS -- TEST 'cpld_control_c48_intel' [24:03, 12:42](2796 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [09:16, 32:58]
-PASS -- TEST 'cpld_control_p8_faster_intel' [48:59, 07:08](1834 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [52:15, 52:26]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [30:44, 20:58](1682 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [12:35, 10:19](1030 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [24:32, 22:25](1651 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [34:08, 05:05]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [05:16, 32:09](1690 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [02:10, 34:28]
-PASS -- TEST 'control_flake_intel' [31:42, 04:43](646 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [29:46, 03:15](595 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [30:52, 03:43](607 MB)
-PASS -- TEST 'control_latlon_intel' [30:38, 03:31](597 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [30:48, 03:24](593 MB)
-PASS -- TEST 'control_c48_intel' [18:38, 10:09](843 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [18:39, 10:09](845 MB)
-PASS -- TEST 'control_c192_intel' [40:02, 12:43](730 MB)
-PASS -- TEST 'control_c384_intel' [43:40, 15:57](897 MB)
-PASS -- TEST 'control_c384gdas_intel' [43:15, 13:51](1020 MB)
-PASS -- TEST 'control_stochy_intel' [26:38, 02:15](603 MB)
-PASS -- TEST 'control_stochy_restart_intel' [04:26, 01:22](435 MB)
-PASS -- TEST 'control_lndp_intel' [29:42, 02:21](603 MB)
-PASS -- TEST 'control_iovr4_intel' [30:42, 03:34](594 MB)
-PASS -- TEST 'control_iovr5_intel' [26:41, 03:21](594 MB)
-PASS -- TEST 'control_p8_intel' [32:33, 04:09](1575 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [33:00, 04:10](1571 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [31:58, 04:03](1581 MB)
-PASS -- TEST 'control_restart_p8_intel' [04:14, 02:34](816 MB)
-PASS -- TEST 'control_noqr_p8_intel' [31:48, 04:04](1571 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [04:34, 02:17](832 MB)
-PASS -- TEST 'control_decomp_p8_intel' [30:37, 04:15](1562 MB)
-PASS -- TEST 'control_2threads_p8_intel' [23:29, 03:52](1663 MB)
-PASS -- TEST 'control_p8_lndp_intel' [16:05, 07:21](1570 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [09:06, 05:21](1634 MB)
-PASS -- TEST 'control_p8_mynn_intel' [01:02, 04:03](1575 MB)
-PASS -- TEST 'merra2_thompson_intel' [40:04, 04:50](1590 MB)
-PASS -- TEST 'regional_control_intel' [32:49, 07:22](758 MB)
-PASS -- TEST 'regional_restart_intel' [04:36, 03:52](931 MB)
-PASS -- TEST 'regional_decomp_intel' [09:36, 07:31](759 MB)
-PASS -- TEST 'regional_2threads_intel' [05:34, 04:28](752 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [08:47, 07:05](766 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [08:40, 07:03](761 MB)
-
-PASS -- COMPILE 'rrfs_intel' [48:09, 32:19]
-PASS -- TEST 'rap_control_intel' [12:12, 10:04](991 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [08:11, 05:49](1213 MB)
-PASS -- TEST 'rap_decomp_intel' [12:02, 10:44](989 MB)
-PASS -- TEST 'rap_2threads_intel' [11:54, 09:43](1084 MB)
-PASS -- TEST 'rap_restart_intel' [07:31, 05:13](993 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [12:17, 10:14](990 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [12:56, 10:55](992 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [09:24, 07:28](1002 MB)
-PASS -- TEST 'hrrr_control_intel' [07:17, 05:28](989 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [07:02, 05:27](977 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [06:57, 05:05](1063 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [03:24, 02:48](916 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [12:26, 10:18](986 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [13:31, 12:27](1942 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [13:25, 12:19](1931 MB)
-
-PASS -- COMPILE 'csawmg_intel' [04:11, 30:57]
-PASS -- TEST 'control_csawmg_intel' [08:38, 08:02](692 MB)
-PASS -- TEST 'control_csawmgt_intel' [08:40, 07:57](699 MB)
-PASS -- TEST 'control_ras_intel' [05:22, 04:28](667 MB)
-
-PASS -- COMPILE 'wam_intel' [38:08, 29:46]
-PASS -- TEST 'control_wam_intel' [03:18, 02:49](502 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [46:09, 31:20]
-PASS -- TEST 'control_p8_faster_intel' [05:34, 03:37](1581 MB)
-PASS -- TEST 'regional_control_faster_intel' [07:36, 06:27](766 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [09:06, 05:40]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [04:23, 03:22](764 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [05:29, 03:24](758 MB)
-PASS -- TEST 'control_stochy_debug_intel' [05:19, 03:44](759 MB)
-PASS -- TEST 'control_lndp_debug_intel' [04:20, 03:22](763 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [06:34, 05:14](806 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [06:34, 05:10](805 MB)
-PASS -- TEST 'control_ras_debug_intel' [04:22, 03:24](774 MB)
-PASS -- TEST 'control_diag_debug_intel' [04:26, 03:26](818 MB)
-PASS -- TEST 'control_debug_p8_intel' [04:55, 03:34](1594 MB)
-PASS -- TEST 'regional_debug_intel' [22:44, 21:43](775 MB)
-PASS -- TEST 'rap_control_debug_intel' [06:23, 06:02](1154 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [06:21, 05:55](1149 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [06:21, 05:59](1150 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [06:22, 06:01](1152 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [06:21, 06:01](1157 MB)
-PASS -- TEST 'rap_diag_debug_intel' [07:30, 06:17](1231 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [07:20, 06:07](1151 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [07:19, 06:07](1149 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [06:20, 06:04](1148 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [06:21, 06:01](1154 MB)
-PASS -- TEST 'rap_noah_debug_intel' [06:18, 05:54](1149 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [06:20, 06:00](1152 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [10:19, 09:48](1145 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [06:17, 05:56](1140 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [08:20, 07:18](1152 MB)
-PASS -- TEST 'rap_flake_debug_intel' [06:18, 06:00](1145 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [12:24, 10:26](1156 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [11:06, 03:45]
-PASS -- TEST 'control_wam_debug_intel' [07:20, 06:08](468 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [31:08, 30:02]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [07:01, 05:07](1070 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [09:56, 08:08](900 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [06:02, 04:23](868 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [09:16, 07:49](946 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [05:44, 04:01](907 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [06:07, 04:38](856 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [08:23, 06:12](897 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [03:29, 02:20](849 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [45:10, 42:24]
-PASS -- TEST 'conus13km_control_intel' [04:02, 02:54](1105 MB)
-PASS -- TEST 'conus13km_2threads_intel' [02:37, 01:30](1052 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [02:34, 01:33](1023 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [31:08, 30:23]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [06:46, 05:30](903 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [15:07, 03:55]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [06:21, 05:58](1030 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [06:22, 05:51](1027 MB)
-PASS -- TEST 'conus13km_debug_intel' [19:47, 18:22](1139 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [19:42, 18:35](880 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [11:38, 10:41](1083 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [19:42, 18:26](1203 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [09:06, 03:53]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:18, 06:03](1071 MB)
-
-PASS -- COMPILE 'hafsw_intel' [39:08, 34:41]
-PASS -- TEST 'hafs_regional_atm_intel' [08:17, 06:59](717 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [07:23, 06:24](1085 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [11:35, 09:12](776 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [18:16, 16:07](800 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [19:26, 17:54](830 MB)
-PASS -- TEST 'gnv1_nested_intel' [07:09, 05:32](776 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [02:10, 31:56]
-PASS -- TEST 'hafs_regional_docn_intel' [10:22, 08:35](766 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [10:21, 08:34](755 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [33:08, 08:05]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [04:17, 03:37](1060 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [03:18, 02:11](1031 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [04:15, 03:31](920 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [04:16, 03:37](927 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:14, 03:40](925 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [04:15, 03:37](1056 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [04:14, 03:39](1063 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [04:14, 03:31](927 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [09:07, 07:52](885 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [09:05, 07:47](848 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [04:11, 03:36](1063 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [05:17, 05:01](2401 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [06:14, 05:03](2356 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [24:07, 03:23]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [08:18, 07:57](1017 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [18:07, 08:15]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [04:17, 03:36](1061 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [03:06, 02:06]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [02:29, 01:34](230 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [02:23, 01:17](255 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:24, 00:49](257 MB)
-
-PASS -- COMPILE 'atml_intel' [35:11, 34:22]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [09:42, 07:52](1613 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [09:42, 07:45](1603 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [05:52, 04:09](862 MB)
-
-PASS -- COMPILE 'atmw_intel' [33:08, 32:49]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [04:24, 02:17](1612 MB)
-
-PASS -- COMPILE 'atmwm_intel' [32:09, 31:12]
-PASS -- TEST 'control_atmwav_intel' [04:10, 02:11](613 MB)
-
-PASS -- COMPILE 'atmaero_intel' [31:08, 30:28]
-PASS -- TEST 'atmaero_control_p8_intel' [07:22, 05:08](1702 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [08:20, 06:16](1719 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [08:07, 06:37](1729 MB)
+PASS -- COMPILE 's2swa_intel' [39:13, 38:28]
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [09:53, 07:28](1828 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [35:13, 34:41]
+PASS -- TEST 'control_CubedSphereGrid_intel' [04:58, 03:57](1538 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [08:11, 07:57]
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [04:26, 03:35](923 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240415 20:38:03
-Ending Date/Time: 20240416 01:26:35
-Total Time: 04h:49m:06s
-Compiles Completed: 33/33
-Tests Completed: 161/161
+Starting Date/Time: 20240425 12:08:23
+Ending Date/Time: 20240425 12:58:47
+Total Time: 00h:50m:35s
+Compiles Completed: 3/3
+Tests Completed: 3/3
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
index e925006e5b..65abf9421d 100644
--- a/tests/logs/RegressionTests_orion.log
+++ b/tests/logs/RegressionTests_orion.log
@@ -1,7 +1,7 @@
 ====START OF ORION REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-684ddd65adbf26b3a8003e05c8af6c4e19be63f8
+d47726e50be21a6b878bfb05f03b0b9fbe725775
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,14 +11,14 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/remove_nowarn)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-402-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
  ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
@@ -26,7 +26,7 @@ Submodule hashes used in testing:
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,280 +35,376 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /work/noaa/stmp/zshrader/stmp/zshrader/FV3_RT/rt_215054
+BASELINE DIRECTORY: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /work/noaa/stmp/zshrader/stmp/zshrader/FV3_RT/rt_400870
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: epic
 * (-l) - USE CONFIG FILE: rt.conf
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [15:06, 14:25]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [07:18, 05:08](3178 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [22:06, 21:07]
-PASS -- TEST 'cpld_control_gfsv17_intel' [18:54, 16:32](1749 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [20:10, 17:26](2033 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [11:01, 08:23](1114 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [20:46, 18:34](1647 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [06:06, 05:46]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [24:51, 22:56](1696 MB)
-
-PASS -- COMPILE 's2swa_intel' [17:06, 16:53]
-PASS -- TEST 'cpld_control_p8_intel' [07:38, 05:35](3208 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [07:58, 05:36](3212 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [05:54, 03:22](3258 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [07:38, 05:41](3236 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [05:54, 03:37](3269 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [08:38, 06:06](3553 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [07:38, 05:43](3205 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [06:33, 04:41](3069 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [07:56, 05:42](3209 MB)
-PASS -- TEST 'cpld_control_c192_p8_intel' [12:46, 10:00](3338 MB)
-PASS -- TEST 'cpld_restart_c192_p8_intel' [10:33, 06:29](3618 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [19:07, 11:01](4117 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [15:52, 07:01](4368 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [07:44, 05:20](3173 MB)
-
-PASS -- COMPILE 's2sw_intel' [16:06, 15:26]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [05:59, 04:26](1731 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [06:15, 04:24](1782 MB)
-
-PASS -- COMPILE 's2swa_debug_intel' [06:06, 05:42]
-PASS -- TEST 'cpld_debug_p8_intel' [10:23, 08:36](3251 MB)
-
-PASS -- COMPILE 's2sw_debug_intel' [06:06, 05:57]
-PASS -- TEST 'cpld_debug_noaero_p8_intel' [07:06, 05:57](1754 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [14:06, 13:16]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [06:23, 04:22](1780 MB)
-
-PASS -- COMPILE 's2s_intel' [14:06, 13:16]
-PASS -- TEST 'cpld_control_c48_intel' [08:52, 08:03](2830 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [21:06, 20:58]
-PASS -- TEST 'cpld_control_p8_faster_intel' [07:37, 05:24](3215 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [19:07, 18:17]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [18:16, 16:40](1773 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [10:26, 08:11](1176 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [20:11, 18:35](1678 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [06:06, 05:08]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [26:02, 24:38](1722 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [14:06, 13:08]
-PASS -- TEST 'control_flake_intel' [04:23, 03:31](655 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [03:24, 02:27](652 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [03:28, 02:34](653 MB)
-PASS -- TEST 'control_latlon_intel' [03:21, 02:29](655 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:29, 02:30](654 MB)
-PASS -- TEST 'control_c48_intel' [06:26, 06:00](874 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [06:27, 05:58](871 MB)
-PASS -- TEST 'control_c192_intel' [10:41, 09:10](858 MB)
-PASS -- TEST 'control_c384_intel' [12:35, 10:13](1247 MB)
-PASS -- TEST 'control_c384gdas_intel' [13:04, 09:04](1358 MB)
-PASS -- TEST 'control_stochy_intel' [02:23, 01:47](654 MB)
-PASS -- TEST 'control_stochy_restart_intel' [01:23, 01:02](505 MB)
-PASS -- TEST 'control_lndp_intel' [02:23, 01:37](658 MB)
-PASS -- TEST 'control_iovr4_intel' [03:26, 02:30](650 MB)
-PASS -- TEST 'control_iovr5_intel' [03:20, 02:34](650 MB)
-PASS -- TEST 'control_p8_intel' [04:08, 02:58](1626 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [04:10, 02:58](1628 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [04:34, 02:48](1628 MB)
-PASS -- TEST 'control_restart_p8_intel' [03:07, 01:46](898 MB)
-PASS -- TEST 'control_noqr_p8_intel' [04:16, 03:00](1620 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [03:20, 01:39](934 MB)
-PASS -- TEST 'control_decomp_p8_intel' [04:14, 02:59](1616 MB)
-PASS -- TEST 'control_2threads_p8_intel' [05:15, 03:03](1669 MB)
-PASS -- TEST 'control_p8_lndp_intel' [06:59, 05:15](1624 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [05:37, 03:58](1693 MB)
-PASS -- TEST 'control_p8_mynn_intel' [05:33, 03:05](1629 MB)
-PASS -- TEST 'merra2_thompson_intel' [05:40, 03:37](1635 MB)
-PASS -- TEST 'regional_control_intel' [06:46, 05:22](856 MB)
-PASS -- TEST 'regional_restart_intel' [03:37, 02:46](1026 MB)
-PASS -- TEST 'regional_decomp_intel' [06:38, 05:38](852 MB)
-PASS -- TEST 'regional_2threads_intel' [04:41, 03:48](847 MB)
-PASS -- TEST 'regional_noquilt_intel' [06:42, 05:12](1365 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [06:45, 05:13](862 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [06:31, 05:13](860 MB)
-PASS -- TEST 'regional_wofs_intel' [07:37, 06:32](1924 MB)
-
-PASS -- COMPILE 'rrfs_intel' [12:06, 11:51]
-PASS -- TEST 'rap_control_intel' [10:29, 08:03](1108 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [05:56, 04:47](1290 MB)
-PASS -- TEST 'rap_decomp_intel' [10:25, 08:04](1033 MB)
-PASS -- TEST 'rap_2threads_intel' [10:23, 07:53](1185 MB)
-PASS -- TEST 'rap_restart_intel' [05:19, 04:02](1111 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [09:26, 07:44](1104 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [10:27, 08:07](1037 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [07:31, 05:52](1131 MB)
-PASS -- TEST 'hrrr_control_intel' [05:18, 03:59](1042 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [05:55, 04:11](1015 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [04:59, 03:21](1109 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [03:21, 02:16](1002 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [09:24, 07:35](1098 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [10:25, 09:08](1993 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:24, 08:58](2072 MB)
-
-PASS -- COMPILE 'csawmg_intel' [12:06, 11:07]
-PASS -- TEST 'control_csawmg_intel' [07:48, 06:05](743 MB)
-PASS -- TEST 'control_csawmgt_intel' [06:41, 05:59](746 MB)
-PASS -- TEST 'control_ras_intel' [04:20, 03:19](741 MB)
-
-PASS -- COMPILE 'wam_intel' [11:06, 10:40]
-PASS -- TEST 'control_wam_intel' [03:23, 02:06](654 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [14:06, 13:13]
-PASS -- TEST 'control_p8_faster_intel' [04:32, 02:42](1621 MB)
-PASS -- TEST 'regional_control_faster_intel' [06:43, 04:40](850 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [05:05, 04:37]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:28, 02:51](818 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:28, 02:45](814 MB)
-PASS -- TEST 'control_stochy_debug_intel' [04:17, 03:09](815 MB)
-PASS -- TEST 'control_lndp_debug_intel' [03:16, 02:49](815 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [05:38, 04:17](867 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [05:35, 04:16](863 MB)
-PASS -- TEST 'control_ras_debug_intel' [03:22, 02:52](831 MB)
-PASS -- TEST 'control_diag_debug_intel' [03:23, 02:47](872 MB)
-PASS -- TEST 'control_debug_p8_intel' [03:43, 03:01](1640 MB)
-PASS -- TEST 'regional_debug_intel' [18:39, 17:40](849 MB)
-PASS -- TEST 'rap_control_debug_intel' [06:20, 05:33](1213 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [06:20, 05:05](1197 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [05:17, 05:04](1202 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [05:19, 04:57](1207 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [05:18, 05:01](1202 MB)
-PASS -- TEST 'rap_diag_debug_intel' [06:42, 05:20](1283 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:17, 05:04](1197 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [05:18, 05:03](1197 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [06:21, 05:04](1208 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:21, 04:56](1201 MB)
-PASS -- TEST 'rap_noah_debug_intel' [06:18, 05:09](1193 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [06:19, 05:04](1202 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [08:16, 07:46](1204 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [05:19, 04:57](1205 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [06:21, 05:45](1209 MB)
-PASS -- TEST 'rap_flake_debug_intel' [05:25, 04:53](1206 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [10:23, 08:17](1204 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [04:05, 03:46]
-PASS -- TEST 'control_wam_debug_intel' [05:18, 05:01](511 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [12:06, 11:21]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [05:55, 04:32](1159 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [08:23, 06:23](1050 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [05:20, 03:24](976 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [07:56, 06:46](1095 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [04:10, 02:59](964 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:15, 03:36](927 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [06:15, 04:55](972 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:20, 01:52](941 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [14:06, 13:34]
-PASS -- TEST 'conus13km_control_intel' [03:58, 02:07](1201 MB)
-PASS -- TEST 'conus13km_2threads_intel' [01:43, 01:04](1120 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [02:40, 01:19](1111 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [13:06, 12:38]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [05:46, 04:13](993 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:05, 03:19]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:20, 04:54](1085 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [07:17, 04:51](1090 MB)
-PASS -- TEST 'conus13km_debug_intel' [16:44, 14:22](1228 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [16:42, 14:19](928 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [09:38, 08:26](1152 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [15:42, 14:02](1296 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [04:05, 03:23]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [06:20, 05:01](1130 MB)
-
-PASS -- COMPILE 'hafsw_intel' [13:06, 12:57]
-PASS -- TEST 'hafs_regional_atm_intel' [07:14, 05:31](736 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [06:29, 05:51](1116 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [09:24, 07:03](835 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [14:13, 12:50](866 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [16:24, 14:41](884 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [07:51, 06:23](506 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [09:19, 07:37](521 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [04:45, 03:09](374 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [10:20, 08:00](478 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [05:41, 04:10](529 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [04:51, 03:56](529 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [06:55, 05:19](587 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:24, 01:36](405 MB)
-PASS -- TEST 'gnv1_nested_intel' [05:53, 04:38](802 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [04:06, 04:00]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [14:54, 13:12](562 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [14:06, 13:46]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [11:59, 09:36](633 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [11:11, 09:41](743 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [14:06, 13:37]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [10:57, 06:54](732 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [13:06, 12:20]
-PASS -- TEST 'hafs_regional_docn_intel' [10:10, 06:24](829 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [10:12, 06:24](819 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [17:56, 16:00](1213 MB)
-
-PASS -- COMPILE 'datm_cdeps_intel' [08:06, 07:06]
-PASS -- TEST 'datm_cdeps_control_cfsr_intel' [05:14, 02:40](1132 MB)
-PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:16, 01:41](1051 MB)
-PASS -- TEST 'datm_cdeps_control_gefs_intel' [04:12, 02:32](1013 MB)
-PASS -- TEST 'datm_cdeps_iau_gefs_intel' [04:13, 02:38](1012 MB)
-PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:12, 02:34](1016 MB)
-PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [04:13, 02:44](1124 MB)
-PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [04:14, 02:39](1140 MB)
-PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:12, 02:31](1016 MB)
-PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [08:10, 05:57](1059 MB)
-PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [07:09, 05:58](1037 MB)
-PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:12, 02:36](1138 MB)
-PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [04:15, 03:32](2496 MB)
-PASS -- TEST 'datm_cdeps_gfs_intel' [04:13, 03:37](2495 MB)
-
-PASS -- COMPILE 'datm_cdeps_debug_intel' [04:05, 03:34]
-PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [07:14, 06:13](1065 MB)
-
-PASS -- COMPILE 'datm_cdeps_faster_intel' [11:06, 09:58]
-PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:14, 02:38](1126 MB)
-
-PASS -- COMPILE 'datm_cdeps_land_intel' [02:06, 00:58]
-PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [01:24, 00:52](257 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_intel' [01:18, 00:51](323 MB)
-PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:21, 00:33](322 MB)
-
-PASS -- COMPILE 'atml_intel' [13:06, 12:36]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [06:35, 04:12](1612 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [06:36, 04:17](1600 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [03:43, 02:31](889 MB)
-
-PASS -- COMPILE 'atmw_intel' [12:06, 11:29]
-PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:23, 01:46](1663 MB)
-
-PASS -- COMPILE 'atmwm_intel' [14:06, 14:04]
-PASS -- TEST 'control_atmwav_intel' [03:06, 01:42](674 MB)
-
-PASS -- COMPILE 'atmaero_intel' [12:06, 11:05]
-PASS -- TEST 'atmaero_control_p8_intel' [05:18, 04:02](3026 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [06:14, 04:49](3100 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [07:00, 05:07](3112 MB)
-
-PASS -- COMPILE 'atmaq_intel' [12:06, 11:11]
-
-PASS -- COMPILE 'atmaq_debug_intel' [04:06, 03:25]
-PASS -- TEST 'regional_atmaq_debug_intel' [23:39, 21:26](4572 MB)
+PASS -- COMPILE 's2swa_32bit_intel' [16:11, 15:56]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:22, 05:18](3112 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [21:11, 20:24]
+PASS -- TEST 'cpld_control_gfsv17_intel' [18:54, 16:34](1744 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [20:01, 17:20](2026 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [10:09, 08:05](1112 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [20:51, 18:36](1644 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [06:11, 05:18]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [24:56, 23:09](1683 MB)
+
+PASS -- COMPILE 's2swa_intel' [16:11, 15:26]
+PASS -- TEST 'cpld_control_p8_intel' [08:02, 05:39](3210 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [08:22, 05:41](3211 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [06:07, 03:18](3253 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [08:02, 05:46](3237 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [06:07, 03:21](3272 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [09:06, 06:18](3556 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [08:02, 05:44](3199 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [06:50, 04:43](3072 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [08:26, 05:46](3212 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [13:06, 10:01](3339 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [10:35, 06:13](3626 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [18:57, 11:05](4120 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [16:22, 07:03](4371 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [08:07, 05:19](3176 MB)
+
+PASS -- COMPILE 's2sw_intel' [13:11, 12:53]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [06:04, 04:23](1734 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [06:30, 04:18](1780 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [06:11, 05:16]
+PASS -- TEST 'cpld_debug_p8_intel' [10:47, 08:41](3251 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [06:11, 05:18]
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [07:12, 06:02](1756 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [13:11, 13:00]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [06:28, 04:26](1775 MB)
+
+PASS -- COMPILE 's2s_intel' [14:11, 14:07]
+PASS -- TEST 'cpld_control_c48_intel' [10:07, 08:09](2835 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [20:11, 19:10]
+PASS -- TEST 'cpld_control_p8_faster_intel' [07:43, 05:21](3152 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [18:11, 17:59]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [18:27, 16:40](1764 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [10:27, 08:14](1177 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [20:18, 18:45](1685 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [05:10, 04:24]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [26:12, 24:12](1720 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [13:11, 12:33]
+PASS -- TEST 'control_flake_intel' [04:32, 03:30](698 MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_CubedSphereGrid_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_CubedSphereGrid_parallel_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_latlon_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_wrtGauss_netcdf_parallel_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_c48_intel' [, ]( MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [06:31, 06:00](872 MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_c192_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_c384_intel' [, ]( MB)
+PASS -- TEST 'control_c384gdas_intel' [12:18, 08:58](1359 MB)
+PASS -- TEST 'control_stochy_intel' [02:25, 01:42](658 MB)
+PASS -- TEST 'control_stochy_restart_intel' [01:22, 00:59](502 MB)
+PASS -- TEST 'control_lndp_intel' [02:26, 01:34](653 MB)
+PASS -- TEST 'control_iovr4_intel' [03:26, 02:32](650 MB)
+PASS -- TEST 'control_iovr5_intel' [03:26, 02:27](654 MB)
+PASS -- TEST 'control_p8_intel' [04:43, 03:04](1626 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [04:43, 02:59](1638 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [04:40, 02:51](1626 MB)
+PASS -- TEST 'control_restart_p8_intel' [03:35, 01:37](899 MB)
+PASS -- TEST 'control_noqr_p8_intel' [04:36, 02:59](1619 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [03:17, 01:37](934 MB)
+PASS -- TEST 'control_decomp_p8_intel' [04:20, 03:00](1608 MB)
+PASS -- TEST 'control_2threads_p8_intel' [04:19, 03:03](1719 MB)
+PASS -- TEST 'control_p8_lndp_intel' [06:59, 05:10](1634 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [05:45, 03:55](1691 MB)
+PASS -- TEST 'control_p8_mynn_intel' [04:34, 02:59](1633 MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'merra2_thompson_intel' [, ]( MB)
+PASS -- TEST 'regional_control_intel' [06:52, 05:13](817 MB)
+PASS -- TEST 'regional_restart_intel' [03:42, 02:45](987 MB)
+PASS -- TEST 'regional_decomp_intel' [06:36, 05:33](851 MB)
+PASS -- TEST 'regional_2threads_intel' [04:33, 03:47](847 MB)
+PASS -- TEST 'regional_noquilt_intel' [05:47, 05:03](1369 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [06:50, 05:10](857 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [06:44, 05:11](858 MB)
+PASS -- TEST 'regional_wofs_intel' [07:45, 06:43](1923 MB)
+
+PASS -- COMPILE 'rrfs_intel' [12:11, 11:29]
+PASS -- TEST 'rap_control_intel' [09:34, 07:43](1106 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [06:00, 04:48](1297 MB)
+PASS -- TEST 'rap_decomp_intel' [09:00, 08:06](1024 MB)
+PASS -- TEST 'rap_2threads_intel' [08:57, 07:52](1183 MB)
+PASS -- TEST 'rap_restart_intel' [05:21, 04:03](1102 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [09:33, 07:40](1106 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [10:29, 08:07](1025 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [07:21, 05:50](1129 MB)
+PASS -- TEST 'hrrr_control_intel' [05:10, 04:00](1035 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [05:09, 04:08](1028 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [05:03, 03:26](1111 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [03:26, 02:10](994 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [09:22, 07:33](1091 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [10:33, 09:09](1990 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [09:27, 08:57](2071 MB)
+
+PASS -- COMPILE 'csawmg_intel' [11:10, 11:05]
+PASS -- TEST 'control_csawmg_intel' [06:42, 05:59](750 MB)
+PASS -- TEST 'control_ras_intel' [04:23, 03:21](735 MB)
+
+PASS -- COMPILE 'wam_intel' [11:10, 11:04]
+PASS -- TEST 'control_wam_intel' [02:22, 02:03](650 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [12:11, 11:23]
+PASS -- TEST 'control_p8_faster_intel' [04:29, 02:39](1623 MB)
+PASS -- TEST 'regional_control_faster_intel' [05:47, 04:35](856 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [06:10, 05:17]
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_CubedSphereGrid_debug_intel' [, ]( MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [, ]( MB)
+PASS -- TEST 'control_stochy_debug_intel' [03:22, 03:01](820 MB)
+PASS -- TEST 'control_lndp_debug_intel' [03:25, 02:50](819 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [05:46, 04:13](863 MB)
+PASS -- TEST 'control_ras_debug_intel' [03:23, 02:48](830 MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'control_diag_debug_intel' [, ]( MB)
+PASS -- TEST 'control_debug_p8_intel' [03:50, 02:45](1650 MB)
+PASS -- TEST 'regional_debug_intel' [18:44, 17:17](810 MB)
+PASS -- TEST 'rap_control_debug_intel' [05:24, 04:58](1198 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [05:27, 04:51](1196 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [05:25, 04:52](1197 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [05:23, 04:57](1205 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [05:21, 05:03](1155 MB)
+PASS -- TEST 'rap_diag_debug_intel' [05:37, 05:05](1280 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [05:23, 05:00](1210 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [05:21, 04:55](1203 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [05:23, 04:52](1204 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [05:22, 04:59](1200 MB)
+PASS -- TEST 'rap_noah_debug_intel' [05:22, 04:52](1200 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [05:21, 05:00](1206 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [08:22, 08:04](1196 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [05:21, 04:51](1194 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [06:26, 06:04](1199 MB)
+PASS -- TEST 'rap_flake_debug_intel' [05:23, 05:02](1205 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [10:24, 08:26](1206 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [04:10, 03:13]
+PASS -- TEST 'control_wam_debug_intel' [05:23, 05:00](507 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [11:10, 10:32]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [06:06, 04:25](1165 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [08:15, 06:25](1051 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [05:35, 03:22](986 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [07:57, 06:39](1043 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [05:18, 03:47](959 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [05:14, 03:36](920 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [06:18, 04:51](996 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [02:27, 01:52](928 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [15:10, 14:26]
+PASS -- TEST 'conus13km_control_intel' [02:55, 02:07](1203 MB)
+PASS -- TEST 'conus13km_2threads_intel' [02:46, 01:23](1122 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [02:53, 01:19](1109 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [12:11, 11:26]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [05:42, 04:13](998 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:10, 03:26]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:23, 04:50](1084 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [05:23, 04:56](1075 MB)
+PASS -- TEST 'conus13km_debug_intel' [14:49, 14:08](1230 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [15:47, 14:41](928 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [09:34, 08:20](1159 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [15:40, 14:21](1297 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [03:10, 03:04]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [05:23, 05:05](1128 MB)
+
+PASS -- COMPILE 'hafsw_intel' [14:11, 13:30]
+PASS -- TEST 'hafs_regional_atm_intel' [07:16, 05:36](744 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [06:31, 06:05](1121 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [08:32, 06:57](831 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [14:17, 12:41](862 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [16:35, 14:37](882 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [08:01, 06:21](499 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [09:24, 07:33](517 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [04:55, 03:12](375 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [10:31, 08:01](474 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [05:46, 04:10](527 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [04:52, 04:01](531 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [06:53, 05:19](588 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:25, 01:26](400 MB)
+PASS -- TEST 'gnv1_nested_intel' [05:59, 04:35](805 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [05:11, 04:36]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [13:58, 13:08](569 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [14:11, 14:08]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [11:02, 09:35](656 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [11:06, 09:41](741 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [14:11, 14:00]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [08:04, 07:03](731 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [13:11, 12:43]
+PASS -- TEST 'hafs_regional_docn_intel' [08:17, 06:19](836 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [08:14, 06:25](819 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [16:58, 15:51](1208 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [07:11, 06:37]
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [03:22, 02:44](1135 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [02:20, 01:41](1092 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [03:17, 02:36](1017 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [03:18, 02:40](1017 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [03:18, 02:40](1020 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:17, 02:42](1117 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [03:17, 02:45](1137 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:18, 02:34](1013 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [07:12, 05:54](1059 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [07:10, 05:51](1036 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [03:15, 02:40](1126 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [04:17, 03:37](2497 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [04:18, 03:41](2442 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [04:11, 03:42]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [07:18, 06:16](1063 MB)
+
+PASS -- COMPILE 'datm_cdeps_faster_intel' [07:10, 06:30]
+PASS -- TEST 'datm_cdeps_control_cfsr_faster_intel' [03:19, 02:40](1126 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [02:11, 01:44]
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [01:29, 00:50](258 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [01:22, 00:50](310 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [01:24, 00:33](309 MB)
+
+PASS -- COMPILE 'atml_intel' [15:11, 14:20]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [06:32, 04:14](1615 MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [06:29, 04:13](1601 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [03:44, 02:20](893 MB)
+
+PASS -- COMPILE 'atmw_intel' [13:10, 12:19]
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [03:18, 01:46](1661 MB)
+
+PASS -- COMPILE 'atmaero_intel' [12:11, 11:33]
+PASS -- TEST 'atmaero_control_p8_intel' [05:11, 03:57](3019 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [06:21, 04:43](3092 MB)
+FAILED: UNABLE TO RUN COMPARISON -- TEST 'atmaero_control_p8_rad_micro_intel' [, ]( MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [04:11, 03:33]
+PASS -- TEST 'regional_atmaq_debug_intel' [22:54, 20:29](4572 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240415 18:41:28
-Ending Date/Time: 20240415 20:03:54
-Total Time: 01h:23m:13s
-Compiles Completed: 39/39
-Tests Completed: 182/182
+Starting Date/Time: 20240422 07:29:19
+Ending Date/Time: 20240422 08:52:50
+Total Time: 01h:23m:58s
+Compiles Completed: 37/37
+Tests Completed: 167/179
+Failed Tests:
+* TEST control_CubedSphereGrid_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_CubedSphereGrid_intel.log
+* TEST control_CubedSphereGrid_parallel_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_CubedSphereGrid_parallel_intel.log
+* TEST control_latlon_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_latlon_intel.log
+* TEST control_wrtGauss_netcdf_parallel_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_wrtGauss_netcdf_parallel_intel.log
+* TEST control_c48_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_c48_intel.log
+* TEST control_c192_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_c192_intel.log
+* TEST control_c384_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_c384_intel.log
+* TEST merra2_thompson_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_merra2_thompson_intel.log
+* TEST control_CubedSphereGrid_debug_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_CubedSphereGrid_debug_intel.log
+* TEST control_wrtGauss_netcdf_parallel_debug_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_wrtGauss_netcdf_parallel_debug_intel.log
+* TEST control_diag_debug_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_control_diag_debug_intel.log
+* TEST atmaero_control_p8_rad_micro_intel: FAILED: UNABLE TO RUN COMPARISON
+-- LOG: /work2/noaa/stmp/zshrader/orion/rt-2173/tests/logs/log_orion/run_atmaero_control_p8_rad_micro_intel.log
+
+NOTES:
+A file 'test_changes.list' was generated with list of all failed tests.
+You can use './rt.sh -c -b test_changes.list' to create baselines for the failed tests.
+If you are using this log as a pull request verification, please commit 'test_changes.list'.
+
+Result: FAILURE
+
+====END OF ORION REGRESSION TESTING LOG====
+====START OF ORION REGRESSION TESTING LOG====
+
+UFSWM hash used in testing:
+d47726e50be21a6b878bfb05f03b0b9fbe725775
+
+Submodule hashes used in testing:
+ 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
+ be5d28fd1b60522e6fc98aefeead20e6aac3530b AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
+ 3d7067a523b8557058755289e4275f5f5c985daf CDEPS-interface/CDEPS (cdeps0.4.17-40-g3d7067a)
+ c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 CICE-interface/CICE (CICE6.0.0-447-gc9e4679)
+ f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
+ 4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
+ cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (heads/develop)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
+ 011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
+ 9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
+-1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+ 041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
+ 35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
+ ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+ 6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
+ d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
+
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /work/noaa/stmp/zshrader/stmp/zshrader/FV3_RT/rt_141822
+
+RT.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: epic
+* (-l) - USE CONFIG FILE: rt.conf
+* (-e) - USE ECFLOW
+
+PASS -- COMPILE 'atm_dyn32_intel' [13:11, 12:33]
+PASS -- TEST 'control_CubedSphereGrid_intel' [03:49, 02:56](1598 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [05:51, 04:16](1604 MB)
+PASS -- TEST 'control_latlon_intel' [03:46, 02:54](1588 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [03:55, 03:00](1599 MB)
+PASS -- TEST 'control_c48_intel' [08:50, 07:10](1774 MB)
+PASS -- TEST 'control_c192_intel' [11:58, 10:27](1749 MB)
+PASS -- TEST 'control_c384_intel' [13:55, 11:23](2001 MB)
+PASS -- TEST 'merra2_thompson_intel' [05:39, 03:14](1640 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [05:12, 05:06]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [03:49, 02:50](1606 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [03:54, 02:47](1612 MB)
+PASS -- TEST 'control_diag_debug_intel' [03:52, 02:58](1664 MB)
+
+PASS -- COMPILE 'atmaero_intel' [12:11, 11:46]
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [06:03, 04:48](3109 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20240422 10:08:06
+Ending Date/Time: 20240422 10:36:28
+Total Time: 00h:28m:37s
+Compiles Completed: 3/3
+Tests Completed: 12/12
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
index 4c318d73a9..f6db2418d3 100644
--- a/tests/logs/RegressionTests_wcoss2.log
+++ b/tests/logs/RegressionTests_wcoss2.log
@@ -1,7 +1,7 @@
 ====START OF WCOSS2 REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
-d5f1957f6d43c8e93bd556e9862958738751400a
+bcc92327e9e244c4ca9db1707f4df177799426b2
 
 Submodule hashes used in testing:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
@@ -11,22 +11,22 @@ Submodule hashes used in testing:
  f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
  4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 6e1bc3ebf0671c91a47ece876afef46300362e67 FV3 (remotes/origin/HEAD-4-g6e1bc3e)
- b447c635161864f2de5e941f6dbe7387b5525167 FV3/atmos_cubed_sphere (201912_public_release-396-gb447c63)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (da95cc4)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
  011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
  9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
  74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
- 945cb2cef5e8bd5949afd4f0fc35c4fb6e95a1bf FV3/upp (upp_v10.2.0-159-g945cb2c)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
 -1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
--a9828705b587c451fc2a7267d1c374d737be425b FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
- ab7bd14d209592d55490e75dbfaa61cb4a62df97 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10032-gab7bd14d2)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
  9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
  d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
- 36d87e5665c359f9dd3201a9d27ceecacc0d8e62 stochastic_physics (ufs-v2.0.0-215-g36d87e5)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
 
 
 NOTES:
@@ -35,236 +35,300 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
-BASELINE DIRECTORY: /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240408
-COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_225418
+BASELINE DIRECTORY: /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_185658
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: GFS-DEV
 * (-e) - USE ECFLOW
 
-PASS -- COMPILE 's2swa_32bit_intel' [12:21, 11:33]
-PASS -- TEST 'cpld_control_p8_mixedmode_intel' [57:36, 02:10](2974 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_intel' [29:41, 28:12]
-PASS -- TEST 'cpld_control_gfsv17_intel' [40:17, 02:07](1595 MB)
-PASS -- TEST 'cpld_control_gfsv17_iau_intel' [19:20, 01:53](1718 MB)
-PASS -- TEST 'cpld_restart_gfsv17_intel' [19:17, 01:38](849 MB)
-PASS -- TEST 'cpld_mpi_gfsv17_intel' [40:18, 01:29](1581 MB)
-
-PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [05:14, 04:21]
-PASS -- TEST 'cpld_debug_gfsv17_intel' [04:45, 01:38](1606 MB)
-
-PASS -- COMPILE 's2swa_intel' [11:22, 10:49]
-PASS -- TEST 'cpld_control_p8_intel' [58:36, 01:31](3004 MB)
-PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [58:36, 01:40](3001 MB)
-PASS -- TEST 'cpld_restart_p8_intel' [48:11, 01:17](3065 MB)
-PASS -- TEST 'cpld_control_qr_p8_intel' [58:36, 01:02](3030 MB)
-PASS -- TEST 'cpld_restart_qr_p8_intel' [48:11, 01:16](3081 MB)
-PASS -- TEST 'cpld_2threads_p8_intel' [58:36, 01:37](3320 MB)
-PASS -- TEST 'cpld_decomp_p8_intel' [58:36, 01:22](2999 MB)
-PASS -- TEST 'cpld_mpi_p8_intel' [58:37, 01:36](2931 MB)
-PASS -- TEST 'cpld_control_ciceC_p8_intel' [58:35, 01:42](3002 MB)
-PASS -- TEST 'cpld_bmark_p8_intel' [58:45, 05:07](3949 MB)
-PASS -- TEST 'cpld_restart_bmark_p8_intel' [12:20, 03:40](4253 MB)
-PASS -- TEST 'cpld_s2sa_p8_intel' [58:36, 02:02](2970 MB)
-
-PASS -- COMPILE 's2sw_intel' [12:22, 11:03]
-PASS -- TEST 'cpld_control_noaero_p8_intel' [57:35, 00:55](1589 MB)
-PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [57:35, 01:22](1639 MB)
-
-PASS -- COMPILE 's2s_aoflux_intel' [22:34, 21:25]
-PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [47:23, 01:47](1633 MB)
-
-PASS -- COMPILE 's2s_intel' [26:38, 24:44]
-PASS -- TEST 'cpld_control_c48_intel' [43:18, 00:55](2652 MB)
-
-PASS -- COMPILE 's2swa_faster_intel' [21:32, 18:20]
-PASS -- TEST 'cpld_control_p8_faster_intel' [17:20, 01:58](3005 MB)
-
-PASS -- COMPILE 's2sw_pdlib_intel' [12:21, 11:28]
-PASS -- TEST 'cpld_control_pdlib_p8_intel' [57:36, 01:32](1605 MB)
-PASS -- TEST 'cpld_restart_pdlib_p8_intel' [36:09, 01:16](904 MB)
-PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [35:58, 01:28](1586 MB)
-
-PASS -- COMPILE 's2sw_pdlib_debug_intel' [23:36, 21:54]
-PASS -- TEST 'cpld_debug_pdlib_p8_intel' [46:22, 01:10](1613 MB)
-
-PASS -- COMPILE 'atm_dyn32_intel' [24:34, 22:37]
-PASS -- TEST 'control_flake_intel' [40:09, 00:43](573 MB)
-PASS -- TEST 'control_CubedSphereGrid_intel' [40:09, 01:01](522 MB)
-PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [40:09, 01:04](532 MB)
-PASS -- TEST 'control_latlon_intel' [40:09, 00:56](523 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [40:09, 01:03](526 MB)
-PASS -- TEST 'control_c48_intel' [40:08, 01:13](714 MB)
-PASS -- TEST 'control_c48.v2.sfc_intel' [40:08, 01:12](719 MB)
-PASS -- TEST 'control_c192_intel' [40:09, 00:26](637 MB)
-PASS -- TEST 'control_c384_intel' [37:32, 01:06](951 MB)
-PASS -- TEST 'control_c384gdas_intel' [37:32, 02:19](1093 MB)
-PASS -- TEST 'control_stochy_intel' [35:33, 01:14](527 MB)
-PASS -- TEST 'control_stochy_restart_intel' [28:04, 00:37](331 MB)
-PASS -- TEST 'control_lndp_intel' [33:45, 00:28](526 MB)
-PASS -- TEST 'control_iovr4_intel' [33:43, 00:22](524 MB)
-PASS -- TEST 'control_iovr5_intel' [33:40, 01:19](525 MB)
-PASS -- TEST 'control_p8_intel' [33:35, 01:29](1512 MB)
-PASS -- TEST 'control_p8.v2.sfc_intel' [33:00, 01:37](1506 MB)
-PASS -- TEST 'control_p8_ugwpv1_intel' [33:00, 01:41](1506 MB)
-PASS -- TEST 'control_restart_p8_intel' [25:16, 01:08](689 MB)
-PASS -- TEST 'control_noqr_p8_intel' [33:00, 01:16](1496 MB)
-PASS -- TEST 'control_restart_noqr_p8_intel' [19:16, 01:33](701 MB)
-PASS -- TEST 'control_decomp_p8_intel' [32:44, 01:40](1498 MB)
-PASS -- TEST 'control_2threads_p8_intel' [32:05, 01:34](1594 MB)
-PASS -- TEST 'control_p8_lndp_intel' [31:10, 00:45](1502 MB)
-PASS -- TEST 'control_p8_rrtmgp_intel' [30:39, 01:53](1564 MB)
-PASS -- TEST 'control_p8_mynn_intel' [30:30, 01:42](1515 MB)
-PASS -- TEST 'merra2_thompson_intel' [30:27, 01:28](1511 MB)
-PASS -- TEST 'regional_control_intel' [29:44, 00:45](610 MB)
-PASS -- TEST 'regional_restart_intel' [19:57, 00:29](777 MB)
-PASS -- TEST 'regional_decomp_intel' [29:42, 00:31](608 MB)
-PASS -- TEST 'regional_2threads_intel' [29:41, 00:29](665 MB)
-PASS -- TEST 'regional_noquilt_intel' [29:38, 00:51](1145 MB)
-PASS -- TEST 'regional_netcdf_parallel_intel' [28:58, 00:41](610 MB)
-PASS -- TEST 'regional_2dwrtdecomp_intel' [28:56, 00:34](608 MB)
-PASS -- TEST 'regional_wofs_intel' [28:34, 01:02](1580 MB)
-
-PASS -- COMPILE 'rrfs_intel' [17:26, 15:10]
-PASS -- TEST 'rap_control_intel' [28:12, 01:25](917 MB)
-PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [41:09, 01:08](1096 MB)
-PASS -- TEST 'rap_decomp_intel' [41:09, 01:48](920 MB)
-PASS -- TEST 'rap_2threads_intel' [41:09, 01:58](1010 MB)
-PASS -- TEST 'rap_restart_intel' [15:50, 01:28](786 MB)
-PASS -- TEST 'rap_sfcdiff_intel' [41:09, 01:22](915 MB)
-PASS -- TEST 'rap_sfcdiff_decomp_intel' [41:09, 01:52](914 MB)
-PASS -- TEST 'rap_sfcdiff_restart_intel' [27:27, 01:30](785 MB)
-PASS -- TEST 'hrrr_control_intel' [41:09, 01:08](907 MB)
-PASS -- TEST 'hrrr_control_decomp_intel' [41:09, 01:06](909 MB)
-PASS -- TEST 'hrrr_control_2threads_intel' [41:10, 01:37](995 MB)
-PASS -- TEST 'hrrr_control_restart_intel' [27:16, 00:55](742 MB)
-PASS -- TEST 'rrfs_v1beta_intel' [41:09, 01:28](909 MB)
-PASS -- TEST 'rrfs_v1nssl_intel' [41:09, 01:15](1875 MB)
-PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [26:11, 00:30](1860 MB)
-
-PASS -- COMPILE 'csawmg_intel' [21:30, 19:17]
-PASS -- TEST 'control_csawmg_intel' [24:36, 01:07](600 MB)
-PASS -- TEST 'control_csawmgt_intel' [24:33, 01:11](599 MB)
-PASS -- TEST 'control_ras_intel' [23:36, 00:47](562 MB)
-
-PASS -- COMPILE 'wam_intel' [20:29, 18:36]
-PASS -- TEST 'control_wam_intel' [23:05, 01:01](271 MB)
-
-PASS -- COMPILE 'atm_faster_dyn32_intel' [17:26, 14:44]
-PASS -- TEST 'control_p8_faster_intel' [22:32, 01:25](1513 MB)
-PASS -- TEST 'regional_control_faster_intel' [22:10, 00:58](612 MB)
-
-PASS -- COMPILE 'atm_debug_dyn32_intel' [12:22, 07:14]
-PASS -- TEST 'control_CubedSphereGrid_debug_intel' [22:02, 00:43](686 MB)
-PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [21:52, 00:49](691 MB)
-PASS -- TEST 'control_stochy_debug_intel' [21:35, 00:24](689 MB)
-PASS -- TEST 'control_lndp_debug_intel' [21:13, 01:08](695 MB)
-PASS -- TEST 'control_csawmg_debug_intel' [21:07, 00:23](733 MB)
-PASS -- TEST 'control_csawmgt_debug_intel' [19:58, 00:37](731 MB)
-PASS -- TEST 'control_ras_debug_intel' [19:58, 00:27](700 MB)
-PASS -- TEST 'control_diag_debug_intel' [19:56, 00:31](748 MB)
-PASS -- TEST 'control_debug_p8_intel' [19:54, 00:58](1526 MB)
-PASS -- TEST 'regional_debug_intel' [19:44, 00:47](631 MB)
-PASS -- TEST 'rap_control_debug_intel' [19:10, 01:15](1076 MB)
-PASS -- TEST 'hrrr_control_debug_intel' [18:44, 00:33](1073 MB)
-PASS -- TEST 'hrrr_gf_debug_intel' [16:43, 01:20](1072 MB)
-PASS -- TEST 'hrrr_c3_debug_intel' [16:00, 01:08](1072 MB)
-PASS -- TEST 'rap_unified_drag_suite_debug_intel' [15:39, 01:12](1077 MB)
-PASS -- TEST 'rap_diag_debug_intel' [15:36, 01:06](1159 MB)
-PASS -- TEST 'rap_cires_ugwp_debug_intel' [15:02, 00:39](1073 MB)
-PASS -- TEST 'rap_unified_ugwp_debug_intel' [14:26, 00:21](1075 MB)
-PASS -- TEST 'rap_lndp_debug_intel' [14:16, 00:32](1075 MB)
-PASS -- TEST 'rap_progcld_thompson_debug_intel' [14:05, 00:37](1076 MB)
-PASS -- TEST 'rap_noah_debug_intel' [13:52, 00:51](1074 MB)
-PASS -- TEST 'rap_sfcdiff_debug_intel' [13:32, 00:52](1073 MB)
-PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [12:49, 00:56](1074 MB)
-PASS -- TEST 'rrfs_v1beta_debug_intel' [12:48, 00:58](1072 MB)
-PASS -- TEST 'rap_clm_lake_debug_intel' [12:44, 01:02](1078 MB)
-PASS -- TEST 'rap_flake_debug_intel' [12:30, 01:04](1076 MB)
-PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [12:25, 01:28](1079 MB)
-
-PASS -- COMPILE 'wam_debug_intel' [11:19, 06:52]
-PASS -- TEST 'control_wam_debug_intel' [12:23, 01:09](301 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [18:28, 13:18]
-PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [12:16, 01:20](953 MB)
-PASS -- TEST 'rap_control_dyn32_phy32_intel' [11:49, 01:17](789 MB)
-PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [11:23, 02:06](788 MB)
-PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [11:13, 00:59](848 MB)
-PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [11:13, 02:07](848 MB)
-PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [10:11, 02:02](791 MB)
-PASS -- TEST 'rap_restart_dyn32_phy32_intel' [02:30, 01:28](688 MB)
-PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [03:41, 01:11](669 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [16:31, 13:15]
-PASS -- TEST 'conus13km_control_intel' [09:14, 00:40](1003 MB)
-PASS -- TEST 'conus13km_2threads_intel' [04:21, 00:24](1009 MB)
-PASS -- TEST 'conus13km_restart_mismatch_intel' [04:13, 00:19](882 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [14:24, 11:22]
-PASS -- TEST 'rap_control_dyn64_phy32_intel' [08:40, 01:05](812 MB)
-
-PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [06:13, 03:01]
-PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [08:19, 00:58](954 MB)
-PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [07:25, 00:38](951 MB)
-PASS -- TEST 'conus13km_debug_intel' [07:25, 01:06](1038 MB)
-PASS -- TEST 'conus13km_debug_qr_intel' [07:16, 00:49](711 MB)
-PASS -- TEST 'conus13km_debug_2threads_intel' [07:08, 00:54](1038 MB)
-PASS -- TEST 'conus13km_radar_tten_debug_intel' [06:57, 00:44](1104 MB)
-
-PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [15:30, 12:02]
-PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [05:51, 00:51](980 MB)
-
-PASS -- COMPILE 'hafsw_intel' [21:30, 16:17]
-PASS -- TEST 'hafs_regional_atm_intel' [05:47, 01:53](616 MB)
-PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [05:44, 01:16](967 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_intel' [05:33, 01:25](660 MB)
-PASS -- TEST 'hafs_regional_atm_wav_intel' [05:26, 02:18](703 MB)
-PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [05:15, 01:19](711 MB)
-PASS -- TEST 'hafs_regional_1nest_atm_intel' [05:05, 00:59](390 MB)
-PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [04:23, 01:46](404 MB)
-PASS -- TEST 'hafs_global_1nest_atm_intel' [04:07, 01:02](283 MB)
-PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [04:02, 02:42](371 MB)
-PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [03:42, 01:26](415 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [03:18, 01:46](411 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [02:50, 01:27](488 MB)
-PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [02:22, 01:13](314 MB)
-
-PASS -- COMPILE 'hafsw_debug_intel' [18:28, 13:42]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [02:03, 01:27](502 MB)
-
-PASS -- COMPILE 'hafsw_faster_intel' [23:42, 19:16]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [01:45, 01:42](533 MB)
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [01:40, 01:24](708 MB)
-
-PASS -- COMPILE 'hafs_mom6w_intel' [20:39, 15:59]
-PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [53:52, 01:33](713 MB)
-
-PASS -- COMPILE 'hafs_all_intel' [20:34, 16:23]
-PASS -- TEST 'hafs_regional_docn_intel' [01:01, 02:01](659 MB)
-PASS -- TEST 'hafs_regional_docn_oisst_intel' [00:55, 01:58](650 MB)
-PASS -- TEST 'hafs_regional_datm_cdeps_intel' [00:14, 01:17](880 MB)
-
-PASS -- COMPILE 'atml_intel' [22:41, 18:42]
-PASS -- TEST 'control_p8_atmlnd_sbs_intel' [59:59, 01:47](1546 MB)
-PASS -- TEST 'control_p8_atmlnd_intel' [59:22, 01:16](1540 MB)
-PASS -- TEST 'control_restart_p8_atmlnd_intel' [51:52, 00:49](741 MB)
-
-PASS -- COMPILE 'atmaero_intel' [14:33, 11:08]
-PASS -- TEST 'atmaero_control_p8_intel' [59:11, 01:31](2851 MB)
-PASS -- TEST 'atmaero_control_p8_rad_intel' [58:54, 01:59](2911 MB)
-PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [58:10, 01:14](2923 MB)
-
-PASS -- COMPILE 'atmaq_debug_intel' [14:29, 10:39]
-PASS -- TEST 'regional_atmaq_debug_intel' [58:09, 01:40](4435 MB)
+PASS -- COMPILE 's2swa_32bit_intel' [27:46, 27:26]
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [59:19, 01:21](2970 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [12:29, 11:51]
+PASS -- TEST 'cpld_control_gfsv17_intel' [14:36, 02:00](1594 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [56:37, 01:52](1717 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [56:37, 01:31](850 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [55:44, 01:30](1569 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [05:19, 04:29]
+PASS -- TEST 'cpld_debug_gfsv17_intel' [21:46, 01:50](1601 MB)
+
+PASS -- COMPILE 's2swa_intel' [16:34, 15:27]
+PASS -- TEST 'cpld_control_p8_intel' [10:29, 01:22](3007 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [10:29, 01:47](3002 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [02:08, 01:43](3066 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [10:29, 01:20](3027 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [02:10, 01:40](3079 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [10:29, 01:07](3314 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [10:29, 01:17](3002 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [10:30, 01:27](2928 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [10:29, 01:49](3003 MB)
+PASS -- TEST 'cpld_bmark_p8_intel' [10:38, 03:00](3952 MB)
+PASS -- TEST 'cpld_restart_bmark_p8_intel' [53:25, 03:56](4251 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [10:29, 01:53](2967 MB)
+
+PASS -- COMPILE 's2sw_intel' [14:29, 13:58]
+PASS -- TEST 'cpld_control_noaero_p8_intel' [12:36, 00:47](1582 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [12:36, 01:52](1639 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [10:24, 10:10]
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [16:40, 00:56](1638 MB)
+
+PASS -- COMPILE 's2s_intel' [25:45, 24:32]
+PASS -- TEST 'cpld_control_c48_intel' [01:18, 00:40](2654 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [27:46, 26:37]
+PASS -- TEST 'cpld_control_p8_faster_intel' [59:19, 01:33](3003 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [12:29, 12:08]
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [14:35, 01:13](1605 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [57:05, 00:41](902 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [57:06, 01:40](1582 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [16:35, 15:50]
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [10:30, 01:38](1613 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [26:42, 25:46]
+PASS -- TEST 'control_flake_intel' [55:02, 00:29](571 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [55:01, 00:24](1477 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [51:16, 01:19](1474 MB)
+PASS -- TEST 'control_latlon_intel' [55:01, 00:22](1475 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [55:01, 00:31](1467 MB)
+PASS -- TEST 'control_c48_intel' [55:00, 00:50](1594 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [55:00, 00:50](714 MB)
+PASS -- TEST 'control_c192_intel' [55:01, 01:22](1584 MB)
+PASS -- TEST 'control_c384_intel' [55:05, 01:59](1911 MB)
+PASS -- TEST 'control_c384gdas_intel' [55:05, 02:25](1089 MB)
+PASS -- TEST 'control_stochy_intel' [55:01, 00:31](527 MB)
+PASS -- TEST 'control_stochy_restart_intel' [52:32, 00:56](336 MB)
+PASS -- TEST 'control_lndp_intel' [55:01, 00:36](526 MB)
+PASS -- TEST 'control_iovr4_intel' [55:01, 00:49](523 MB)
+PASS -- TEST 'control_iovr5_intel' [55:01, 00:50](527 MB)
+PASS -- TEST 'control_p8_intel' [55:01, 01:55](1502 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [55:01, 01:52](1513 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [55:01, 01:57](1511 MB)
+PASS -- TEST 'control_restart_p8_intel' [49:30, 00:48](693 MB)
+PASS -- TEST 'control_noqr_p8_intel' [55:01, 01:54](1499 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [49:30, 00:52](700 MB)
+PASS -- TEST 'control_decomp_p8_intel' [54:34, 01:25](1499 MB)
+PASS -- TEST 'control_2threads_p8_intel' [53:10, 01:22](1589 MB)
+PASS -- TEST 'control_p8_lndp_intel' [52:33, 01:24](1501 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [51:35, 02:02](1556 MB)
+PASS -- TEST 'control_p8_mynn_intel' [51:29, 01:57](1513 MB)
+PASS -- TEST 'merra2_thompson_intel' [51:29, 01:44](1513 MB)
+PASS -- TEST 'regional_control_intel' [51:20, 00:20](608 MB)
+PASS -- TEST 'regional_restart_intel' [45:35, 00:13](778 MB)
+PASS -- TEST 'regional_decomp_intel' [51:14, 00:54](608 MB)
+PASS -- TEST 'regional_2threads_intel' [51:11, 00:56](665 MB)
+PASS -- TEST 'regional_noquilt_intel' [51:03, 00:23](1141 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [50:46, 00:28](609 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [50:29, 00:22](609 MB)
+PASS -- TEST 'regional_wofs_intel' [49:33, 00:58](1580 MB)
+
+PASS -- COMPILE 'rrfs_intel' [30:47, 30:16]
+PASS -- TEST 'rap_control_intel' [45:48, 01:46](921 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [45:21, 00:33](1099 MB)
+PASS -- TEST 'rap_decomp_intel' [44:57, 01:11](917 MB)
+PASS -- TEST 'rap_2threads_intel' [44:56, 00:45](1012 MB)
+PASS -- TEST 'rap_restart_intel' [36:22, 01:12](789 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [44:45, 01:26](914 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [44:32, 01:40](915 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [33:21, 01:20](783 MB)
+PASS -- TEST 'hrrr_control_intel' [44:26, 01:23](910 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [43:32, 01:19](911 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [43:14, 01:36](993 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [36:15, 01:05](741 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [42:58, 01:44](912 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [42:56, 01:16](1874 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [42:27, 01:03](1863 MB)
+
+PASS -- COMPILE 'csawmg_intel' [15:30, 14:57]
+PASS -- TEST 'control_csawmg_intel' [59:06, 00:32](602 MB)
+PASS -- TEST 'control_ras_intel' [59:06, 00:51](560 MB)
+
+PASS -- COMPILE 'wam_intel' [09:23, 08:32]
+PASS -- TEST 'control_wam_intel' [05:11, 00:58](270 MB)
+
+PASS -- COMPILE 'atm_faster_dyn32_intel' [24:39, 23:52]
+PASS -- TEST 'control_p8_faster_intel' [47:51, 01:29](1507 MB)
+PASS -- TEST 'regional_control_faster_intel' [46:59, 00:57](610 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [34:51, 33:49]
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [34:59, 00:41](1488 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [34:54, 00:51](1492 MB)
+PASS -- TEST 'control_stochy_debug_intel' [33:54, 00:41](690 MB)
+PASS -- TEST 'control_lndp_debug_intel' [33:42, 00:24](694 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [33:41, 01:08](733 MB)
+PASS -- TEST 'control_ras_debug_intel' [33:14, 00:41](703 MB)
+PASS -- TEST 'control_diag_debug_intel' [32:47, 01:14](1542 MB)
+PASS -- TEST 'control_debug_p8_intel' [32:38, 01:05](1518 MB)
+PASS -- TEST 'regional_debug_intel' [32:28, 00:45](630 MB)
+PASS -- TEST 'rap_control_debug_intel' [32:19, 00:54](1073 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [32:07, 00:57](1067 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [32:00, 00:57](1075 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [31:54, 00:50](1071 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [31:36, 00:47](1075 MB)
+PASS -- TEST 'rap_diag_debug_intel' [31:33, 00:44](1155 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [31:22, 00:49](1072 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [31:04, 00:50](1076 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [30:09, 00:53](1076 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [30:03, 00:53](1072 MB)
+PASS -- TEST 'rap_noah_debug_intel' [29:55, 01:00](1076 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [29:53, 00:54](1071 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [29:28, 00:49](1076 MB)
+PASS -- TEST 'rrfs_v1beta_debug_intel' [29:17, 01:00](1072 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [29:17, 01:07](1075 MB)
+PASS -- TEST 'rap_flake_debug_intel' [28:54, 00:52](1076 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [28:47, 01:13](1081 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [05:18, 05:00]
+PASS -- TEST 'control_wam_debug_intel' [05:10, 01:00](298 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [15:29, 15:03]
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [49:33, 01:15](955 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [49:30, 01:07](790 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [48:59, 02:19](788 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [48:22, 01:13](856 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [46:58, 01:07](837 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [46:30, 00:57](787 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [42:14, 01:36](690 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [41:50, 00:49](668 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_intel' [18:33, 17:53]
+PASS -- TEST 'conus13km_control_intel' [46:28, 00:31](1006 MB)
+PASS -- TEST 'conus13km_2threads_intel' [41:50, 00:30](1008 MB)
+PASS -- TEST 'conus13km_restart_mismatch_intel' [41:34, 00:36](881 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [13:27, 12:22]
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [46:22, 00:53](811 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [05:19, 04:47]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [46:19, 00:33](953 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [46:20, 00:43](948 MB)
+PASS -- TEST 'conus13km_debug_intel' [45:54, 01:09](1038 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [41:30, 01:03](709 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [41:25, 00:26](1036 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [40:38, 01:16](1103 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [06:20, 05:25]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [28:07, 00:58](980 MB)
+
+PASS -- COMPILE 'hafsw_intel' [16:31, 16:09]
+PASS -- TEST 'hafs_regional_atm_intel' [40:40, 02:04](618 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [40:16, 00:33](965 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_intel' [39:45, 01:29](662 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [39:45, 02:14](696 MB)
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [39:41, 02:04](712 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [39:06, 00:54](387 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [38:59, 02:13](413 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [38:56, 01:22](281 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [38:28, 02:17](370 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [37:30, 01:18](419 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [37:11, 00:49](415 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_intel' [36:58, 01:32](488 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [36:46, 01:11](312 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [06:20, 05:19]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [36:18, 01:32](494 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [10:23, 10:01]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [21:59, 01:35](532 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [21:59, 01:37](710 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [11:24, 10:28]
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [36:18, 00:55](709 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [10:24, 09:42]
+PASS -- TEST 'hafs_regional_docn_intel' [35:44, 01:23](665 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [28:02, 01:19](647 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [27:56, 00:25](881 MB)
+
+PASS -- COMPILE 'atml_intel' [22:38, 20:33]
+FAILED: RUN DID NOT COMPLETE -- TEST 'control_p8_atmlnd_sbs_intel' [, ]( MB)
+PASS -- TEST 'control_p8_atmlnd_intel' [25:20, 01:16](1543 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [18:46, 00:23](739 MB)
+
+PASS -- COMPILE 'atmaero_intel' [18:35, 16:03]
+PASS -- TEST 'atmaero_control_p8_intel' [27:13, 01:30](2853 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [27:11, 00:52](2911 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [27:00, 01:50](2920 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [05:18, 04:27]
+PASS -- TEST 'regional_atmaq_debug_intel' [25:58, 01:23](4432 MB)
 
 SYNOPSIS:
-Starting Date/Time: 20240416 14:49:41
-Ending Date/Time: 20240416 16:29:19
-Total Time: 01h:40m:15s
+Starting Date/Time: 20240423 18:32:37
+Ending Date/Time: 20240423 20:00:11
+Total Time: 01h:28m:12s
 Compiles Completed: 30/30
-Tests Completed: 157/157
+Tests Completed: 154/155
+Failed Tests:
+* TEST control_p8_atmlnd_sbs_intel: FAILED: RUN DID NOT COMPLETE
+-- LOG: /lfs/h2/emc/nems/noscrub/brian.curtis/git/jiandewang/ufs-weather-model/tests/logs/log_wcoss2/run_control_p8_atmlnd_sbs_intel.log
+
+NOTES:
+A file 'test_changes.list' was generated with list of all failed tests.
+You can use './rt.sh -c -b test_changes.list' to create baselines for the failed tests.
+If you are using this log as a pull request verification, please commit 'test_changes.list'.
+
+Result: FAILURE
+
+====END OF WCOSS2 REGRESSION TESTING LOG====
+====START OF WCOSS2 REGRESSION TESTING LOG====
+
+UFSWM hash used in testing:
+bcc92327e9e244c4ca9db1707f4df177799426b2
+
+Submodule hashes used in testing:
+ 37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
+ be5d28fd1b60522e6fc98aefeead20e6aac3530b AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-198-gbe5d28fd1)
+ 3d7067a523b8557058755289e4275f5f5c985daf CDEPS-interface/CDEPS (cdeps0.4.17-40-g3d7067a)
+ c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 CICE-interface/CICE (CICE6.0.0-447-gc9e4679)
+ f6ff8f7c4d4cb6feabe3651b13204cf43fc948e3 CICE-interface/CICE/icepack (Icepack1.1.0-182-gf6ff8f7)
+ 4e19850cb083bc474b7cde5dc2f8506ec74cc442 CMEPS-interface/CMEPS (cmeps_v0.4.1-2306-g4e19850)
+ cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
+ da95cc428d8b626e99250fd57a4279b4980044f8 FV3 (da95cc4)
+ 97114888f529c2df70ed4a350fd2428df74839ff FV3/atmos_cubed_sphere (201912_public_release-389-g9711488)
+ 011db4f80a02cba6d65958ace56e8efb197be62b FV3/ccpp/framework (ccpp_transition_to_vlab_master_20190705-704-g011db4f)
+ 9b0ac7b16a45afe5e7f1abf9571d3484158a5b43 FV3/ccpp/physics (EP4-741-g9b0ac7b1)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 5faac752d9550d3570705358fa1eb3f5ac78a786 FV3/upp (upp_v10.2.0-185-g5faac75)
+-1ba8270870947b583cd51bc72ff8960f4c1fb36e FV3/upp/sorc/libIFI.fd
+-7476b8f2790a47d788f79cebfdbb551567ae7cf8 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
+ 041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
+ 35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
+ 6d0150d6c212c7052e73aa8ab76418d5b28fb780 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10045-g6d0150d6c)
+ 9423197f894112edfcb1502245f7d7b873d551f9 MOM6-interface/MOM6/pkg/CVMix-src (9423197)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+ 6a51f0295bc1a877475b527157a33aa86eb532fe NOAHMP-interface/noahmp (v3.7.1-426-g6a51f02)
+ d9b3172f4197c65d471662c6952a668152d71230 WW3 (6.07.1-345-gd9b3172f)
+ 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a stochastic_physics (ufs-v2.0.0-216-g31e4e3e)
+
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20240419
+COMPARISON DIRECTORY: /lfs/h2/emc/ptmp/brian.curtis/FV3_RT/rt_66976
+
+RT.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: GFS-DEV
+* (-b) - NEW BASELINES FROM FILE: test_changes.list
+* (-e) - USE ECFLOW
+
+PASS -- COMPILE 'atml_intel' [10:25, 10:08]
+PASS -- TEST 'control_p8_atmlnd_sbs_intel' [39:51, 01:10](1543 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20240423 20:04:01
+Ending Date/Time: 20240423 20:27:55
+Total Time: 00h:24m:14s
+Compiles Completed: 1/1
+Tests Completed: 1/1
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/parm/control_ugwpv1.nml.IN b/tests/parm/control_ugwpv1.nml.IN
deleted file mode 100644
index ea685cd24e..0000000000
--- a/tests/parm/control_ugwpv1.nml.IN
+++ /dev/null
@@ -1,319 +0,0 @@
-&atmos_model_nml
-  blocksize = 32
-  chksum_debug = .false.
-  dycore_only = .false.
-  ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-  prepend_date = .false.
-/
-
-&fms_nml
-  clock_grain = 'ROUTINE'
-  domains_stack_size = 3000000
-  print_memory_usage = .false.
-/
-
-&fms2_io_nml
-  netcdf_default_format = "netcdf4"
-/
-
-&fv_core_nml
-  layout = @[INPES],@[JNPES]
-  io_layout = 1,1
-  npx = @[NPX]
-  npy = @[NPY]
-  ntiles = 6
-  npz = @[NPZ]
-  grid_type = -1
-  make_nh = @[MAKE_NH]
-  fv_debug = .false.
-  range_warn = .false.
-  reset_eta = .false.
-  n_sponge = 42
-  nudge_qv = .true.
-  nudge_dz = .false.
-  tau = 10.
-  rf_cutoff = 7.5e2
-  d2_bg_k1 = 0.20
-  d2_bg_k2 = 0.0
-  kord_tm = -9
-  kord_mt = 9
-  kord_wz = 9
-  kord_tr = 9
-  hydrostatic = .false.
-  phys_hydrostatic = .false.
-  use_hydro_pressure = .false.
-  beta = 0.
-  a_imp = 1.
-  p_fac = 0.1
-  k_split = 2
-  n_split = 6
-  nwat = 6
-  na_init = @[NA_INIT]
-  d_ext = 0.
-  dnats = 1
-  fv_sg_adj = 450
-  d2_bg = 0.
-  nord = 2
-  dddmp = 0.1
-  d4_bg = 0.12
-  vtdm4 = 0.02
-  delt_max = 0.002
-  ke_bg = 0.
-  do_vort_damp = .true.
-  external_ic = @[EXTERNAL_IC]
-  external_eta = .true.
-  gfs_phil = .false.
-  nggps_ic = @[NGGPS_IC]
-  mountain = @[MOUNTAIN]
-  ncep_ic = .false.
-  d_con = 1.
-  hord_mt = 5
-  hord_vt = 5
-  hord_tm = 5
-  hord_dp = -5
-  hord_tr = 8
-  adjust_dry_mass = .false.
-  consv_te = 1.
-  do_sat_adj = .true.
-  consv_am = .false.
-  fill = .true.
-  dwind_2d = .false.
-  print_freq = 6
-  warm_start = @[WARM_START]
-  no_dycore = .false.
-  z_tracer = .true.
-  agrid_vel_rst = .true.
-  read_increment = .false.
-  res_latlon_dynamics = ""
-/
-
-&external_ic_nml
-  filtered_terrain = .true.
-  levp = @[NPZP]
-  gfs_dwinds = .true.
-  checker_tr = .false.
-  nt_checker = 0
-/
-
-&gfs_physics_nml
-  fhzero       = 6
-  h2o_phys     = .true.
-  ldiag3d      = .false.
-  fhcyc        = 24
-  use_ufo      = .true.
-  pre_rad      = .false.
-  imp_physics  = 11
-  pdfcld       = .false.
-  fhswr        = 3600.
-  fhlwr        = 3600.
-  ialb         = 1
-  iems         = 1
-  iaer         = 5111
-  icliq_sw     = 2
-  iovr         = 3
-  ico2         = 2
-  isubc_sw     = 2
-  isubc_lw     = 2
-  isol         = 2
-  lwhtr        = .true.
-  swhtr        = .true.
-  cnvgwd       = .true.
-  shal_cnv     = .true.
-  cal_pre      = .false.
-  redrag       = .true.
-  dspheat      = .true.
-  hybedmf      = .false.
-  satmedmf     = .true.
-  isatmedmf    = 1
-  lheatstrg    = @[LHEATSTRG]
-  lseaspray    = @[LSEASPRAY]
-  random_clds  = .false.
-  trans_trac   = .true.
-  cnvcld       = .true.
-  imfshalcnv   = 2
-  imfdeepcnv   = 2
-  cdmbgwd      = @[CDMBWD]
-  prslrd0      = 0.
-  ivegsrc      = 1
-  isot         = 1
-  lsoil        = 4
-  lsm          = 1
-  iopt_dveg    = 1
-  iopt_crs     = 1
-  iopt_btr     = 1
-  iopt_run     = 1
-  iopt_sfc     = 1
-  iopt_frz     = 1
-  iopt_inf     = 1
-  iopt_rad     = 1
-  iopt_alb     = 2
-  iopt_snf     = 4
-  iopt_tbot    = 2
-  iopt_stc     = 1
-  iopt_trs     = 2
-  iopt_diag    = 2
-  debug        = .false.
-  oz_phys      = .false.
-  oz_phys_2015 = .true.
-  nstf_name    = 2,0,0,0,0
-  nst_anl      = .true.
-  psautco      = 0.0008,0.0005
-  prautco      = 0.00015,0.00015
-  lgfdlmprad   = .true.
-  effr_in      = .true.
-  ldiag_ugwp   = .false.
-  do_ugwp      = .false.
-  do_tofd      = .false.
-  do_sppt      = .false.
-  do_shum      = .false.
-  do_skeb      = .false.
-  ttendlim     = 0.005
-  bl_mynn_edmf = 1
-  bl_mynn_tkeadvect = .true.
-  min_lakeice  = 0.15
-  min_seaice   = 0.15
-  gwd_opt      = 1
-  do_ugwp_v1   = @[DO_UGWP_V1]
-  do_ugwp_v1_w_gsldrag = .true.
-  do_ugwp_v1_orog_only = .false.
-  do_gsl_drag_ls_bl    = .false.
-  do_gsl_drag_ss       = .false.
-  do_gsl_drag_tofd     = .false.
-  do_ugwp_v0           = .false.
-  do_ugwp_v0_orog_only = .false.
-
-/
-
-&gfdl_cloud_microphysics_nml
-  sedi_transport = .true.
-  do_sedi_heat = .false.
-  rad_snow = .true.
-  rad_graupel = .true.
-  rad_rain = .true.
-  const_vi = .false.
-  const_vs = .false.
-  const_vg = .false.
-  const_vr = .false.
-  vi_max = 1.
-  vs_max = 2.
-  vg_max = 12.
-  vr_max = 12.
-  qi_lim = 1.
-  prog_ccn = .false.
-  do_qa = .true.
-  fast_sat_adj = .true.
-  tau_l2v = 225.
-  tau_v2l = 150.
-  tau_g2v = 900.
-  rthresh = 10.e-6  ! This is a key parameter for cloud water
-  dw_land  = 0.16
-  dw_ocean = 0.10
-  ql_gen = 1.0e-3
-  ql_mlt = 1.0e-3
-  qi0_crt = 8.0E-5
-  qs0_crt = 1.0e-3
-  tau_i2s = 1000.
-  c_psaci = 0.05
-  c_pgacs = 0.01
-  rh_inc = 0.30
-  rh_inr = 0.30
-  rh_ins = 0.30
-  ccn_l = 300.
-  ccn_o = 100.
-  c_paut = 0.5
-  c_cracw = 0.8
-  use_ppm = .false.
-  use_ccn = .true.
-  mono_prof = .true.
-  z_slope_liq  = .true.
-  z_slope_ice  = .true.
-  de_ice = .false.
-  fix_negative = .true.
-  icloud_f = 1
-  mp_time = 150.
-  reiflag = 2
-/
-
-&interpolator_nml
-  interp_method = 'conserve_great_circle'
-/
-
-&namsfc
-  FNGLAC   = 'global_glacier.2x2.grb'
-  FNMXIC   = 'global_maxice.2x2.grb'
-  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
-  FNSNOC   = 'global_snoclim.1.875.grb'
-  FNZORC   = 'igbp'
-  FNALBC   = @[FNALBC]
-  FNALBC2  = 'global_albedo4.1x1.grb'
-  FNAISC   = 'CFSR.SEAICE.1982.2012.monthly.clim.grb'
-  FNTG3C   = 'global_tg3clim.2.6x1.5.grb'
-  FNVEGC   = 'global_vegfrac.0.144.decpercent.grb'
-  FNVETC   = @[FNVETC]
-  FNSOTC   = @[FNSOTC]
-  FNSOCC   = @[FNSOCC]
-  FNSMCC   = 'global_soilmgldas.statsgo.t1534.3072.1536.grb'
-  FNMSKH   = 'global_slmask.t1534.3072.1536.grb'
-  FNTSFA   = ''
-  FNACNA   = ''
-  FNSNOA   = ''
-  FNVMNC   = 'global_shdmin.0.144x0.144.grb'
-  FNVMXC   = 'global_shdmax.0.144x0.144.grb'
-  FNSLPC   = 'global_slope.1x1.grb'
-  FNABSC   = @[FNABSC]
-  LDEBUG   = .false.
-  FSMCL(2) = 99999
-  FSMCL(3) = 99999
-  FSMCL(4) = 99999
-  LANDICE  = .true.
-  FTSFS    = 90
-  FAISL    = 99999
-  FAISS    = 99999
-  FSNOL    = 99999
-  FSNOS    = 99999
-  FSICL    = 99999
-  FSICS    = 99999
-  FTSFL    = 99999
-  FVETL    = 99999
-  FSOTL    = 99999
-  FvmnL    = 99999
-  FvmxL    = 99999
-  FSLPL    = 99999
-  FABSL    = 99999
-/
-
-&fv_grid_nml
-  grid_file = 'INPUT/grid_spec.nc'
-/
-
-&nam_stochy
-/
-
-&nam_sfcperts
-/
-
-&cires_ugwp_nml
-  knob_ugwp_solver   = 2
-  knob_ugwp_version  = 1
-  knob_ugwp_source   = 1,1,0,0
-  knob_ugwp_wvspec   = 1,25,25,25
-  knob_ugwp_azdir    = 2,4,4,4
-  knob_ugwp_stoch    = 0,0,0,0
-  knob_ugwp_effac    = 1,1,1,1
-  knob_ugwp_doaxyz   = 1
-  knob_ugwp_doheat   = 1
-  knob_ugwp_dokdis   = 2
-  knob_ugwp_ndx4lh   = 4
-  knob_ugwp_palaunch = 275.0e2
-  knob_ugwp_nslope   = 0
-  knob_ugwp_lzmax    = 15.750e3
-  knob_ugwp_lzmin    = 0.75e3
-  knob_ugwp_lzstar   = 2.0e3
-  knob_ugwp_taumin   = 0.25e-3
-  knob_ugwp_tauamp   = 3.0e-3
-  knob_ugwp_lhmet    = 200.0e3
-  knob_ugwp_orosolv  = 'pss-1986'
-/
diff --git a/tests/parm/cpld_control.nml.IN b/tests/parm/global_control.nml.IN
similarity index 93%
rename from tests/parm/cpld_control.nml.IN
rename to tests/parm/global_control.nml.IN
index 9f6703a167..c2e5ec8e43 100644
--- a/tests/parm/cpld_control.nml.IN
+++ b/tests/parm/global_control.nml.IN
@@ -17,7 +17,7 @@
 /
 
 &fms2_io_nml
-  netcdf_default_format = "netcdf4"
+  netcdf_default_format = 'netcdf4'
 /
 
 &fv_core_nml
@@ -80,7 +80,7 @@
   hord_dp = -5
   hord_tr = 8
   adjust_dry_mass = .false.
-  dry_mass=98320.0
+  dry_mass = 98320.0
   consv_te = 1.
   do_sat_adj = @[DO_SAT_ADJ]
   consv_am = .false.
@@ -113,7 +113,7 @@
   use_ufo      = .true.
   pre_rad      = .false.
   imp_physics  = @[IMP_PHYSICS]
-  iovr         = 3
+  iovr         = @[IOVR]
   ltaerosol    = .false.
   lradar       = .false.
   ttendlim     = -999
@@ -140,7 +140,7 @@
   do_gsl_drag_ss       = @[DO_GSL_DRAG_SS]
   do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
   do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
-  min_lakeice  = 0.15
+  min_lakeice  = @[MIN_LAKEICE]
   min_seaice   = @[MIN_SEAICE]
   use_cice_alb = @[USE_CICE_ALB]
   pdfcld       = .false.
@@ -149,7 +149,7 @@
   ialb         = @[IALB]
   iems         = @[IEMS]
   iaer         = @[IAER]
-  icliq_sw     = 2
+  icliq_sw     = @[ICLIQ_SW]
   ico2         = 2
   isubc_sw     = 2
   isubc_lw     = 2
@@ -298,12 +298,12 @@
   tau_l2v = 225.
   tau_v2l = 150.
   tau_g2v = 900.
-  rthresh = 10.e-6  ! This is a key parameter for cloud water
+  rthresh = 10.e-6   ! This is a key parameter for cloud water
   dw_land  = 0.16
   dw_ocean = 0.10
   ql_gen = 1.0e-3
   ql_mlt = 1.0e-3
-  qi0_crt = 8.0E-5
+  qi0_crt = 8.0e-5
   qs0_crt = 1.0e-3
   tau_i2s = 1000.
   c_psaci = 0.05
@@ -332,14 +332,14 @@
 /
 
 &namsfc
-  FNGLAC   = 'global_glacier.2x2.grb'
-  FNMXIC   = 'global_maxice.2x2.grb'
-  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
-  FNSNOC   = 'global_snoclim.1.875.grb'
-  FNZORC   = 'igbp'
+  FNGLAC   = @[FNGLAC]
+  FNMXIC   = @[FNMXIC]
+  FNTSFC   = @[FNTSFC]
+  FNSNOC   = @[FNSNOC]
+  FNZORC   = @[FNZORC]
   FNALBC   = @[FNALBC]
   FNALBC2  = @[FNALBC2]
-  FNAISC   = 'IMS-NIC.blended.ice.monthly.clim.grb'
+  FNAISC   = @[FNAISC]
   FNTG3C   = @[FNTG3C]
   FNVEGC   = @[FNVEGC]
   FNVETC   = @[FNVETC]
@@ -354,12 +354,12 @@
   FNVMXC   = @[FNVMXC]
   FNSLPC   = @[FNSLPC]
   FNABSC   = @[FNABSC]
-  LDEBUG   =.false.
+  LDEBUG   = .false.
   FSMCL(2) = 99999
   FSMCL(3) = 99999
   FSMCL(4) = 99999
   LANDICE  = @[LANDICE]
-  FTSFS    = 90
+  FTSFS    = @[FTSFS]
   FAISL    = 99999
   FAISS    = 99999
   FSNOL    = 99999
@@ -385,9 +385,9 @@
 &nam_sfcperts
   lndp_type      = @[LNDP_TYPE]
   lndp_model_type = @[LNDP_MODEL_TYPE]
-  LNDP_TAU=21600,
-  LNDP_LSCALE=500000,
-  ISEED_LNDP=2010,
+  LNDP_TAU=@[LNDP_TAU]
+  LNDP_LSCALE=@[LNDP_LSCALE]
+  ISEED_LNDP=@[ISEED_LNDP]
   lndp_var_list = @[LNDP_VAR_LIST]
   lndp_prt_list = @[LNDP_PRT_LIST]
 /
@@ -396,6 +396,6 @@
   output_directory = '@[MOM6_OUTPUT_DIR]',
   input_filename = '@[MOM6_RESTART_SETTING]'
   restart_input_dir = 'INPUT/',
-  restart_output_dir = '@[MOM6_RESTART_DIR]',
+  restart_output_dir = '@[MOM6_RESTART_DIR]'
   parameter_filename = 'INPUT/MOM_input',
                        'INPUT/MOM_override'/
diff --git a/tests/parm/merra2_thompson.nml.IN b/tests/parm/merra2_thompson.nml.IN
deleted file mode 100644
index 1b024bf635..0000000000
--- a/tests/parm/merra2_thompson.nml.IN
+++ /dev/null
@@ -1,371 +0,0 @@
-&atmos_model_nml
-  blocksize = 32
-  chksum_debug = .false.
-  dycore_only = .false.
-  ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-  prepend_date = .false.
-  max_output_fields = @[MAX_OUTPUT_FIELDS]
-/
-
-&fms_nml
-  clock_grain = 'ROUTINE'
-  domains_stack_size = @[DOMAINS_STACK_SIZE]
-  print_memory_usage = .false.
-/
-
-&fms2_io_nml
-  netcdf_default_format = "netcdf4"
-/
-
-&fv_core_nml
-  layout = @[INPES],@[JNPES]
-  io_layout = 1,1
-  npx = @[NPX]
-  npy = @[NPY]
-  ntiles = 6
-  npz = @[NPZ]
-  dz_min = @[DZ_MIN]
-  psm_bc = @[PSM_BC]
-  grid_type = -1
-  make_nh = @[MAKE_NH]
-  fv_debug = .false.
-  range_warn = .true.
-  reset_eta = .false.
-  n_sponge = 42
-  nudge_qv = .true.
-  nudge_dz = .false.
-  tau = 10.0
-  rf_cutoff = 7.5e2
-  d2_bg_k1 = @[D2_BG_K1]
-  d2_bg_k2 = @[D2_BG_K2]
-  kord_tm = -9
-  kord_mt = 9
-  kord_wz = 9
-  kord_tr = 9
-  hydrostatic = .false.
-  phys_hydrostatic = .false.
-  use_hydro_pressure = .false.
-  beta = 0.
-  a_imp = 1.
-  p_fac = 0.1
-  k_split = 2
-  n_split = 6
-  nwat = 6
-  na_init = @[NA_INIT]
-  d_ext = 0.
-  dnats = @[DNATS]
-  fv_sg_adj = 450
-  d2_bg = 0.
-  nord = 2
-  dddmp = @[DDDMP]
-  d4_bg = 0.12
-  vtdm4 = 0.02
-  delt_max = 0.002
-  ke_bg = 0.
-  do_vort_damp = .true.
-  external_ic = @[EXTERNAL_IC]
-  external_eta = .true.
-  gfs_phil = .false.
-  nggps_ic = @[NGGPS_IC]
-  mountain = @[MOUNTAIN]
-  ncep_ic = .false.
-  d_con = 1.
-  hord_mt = 5
-  hord_vt = 5
-  hord_tm = 5
-  hord_dp = -5
-  hord_tr = 8
-  adjust_dry_mass = .false.
-  dry_mass=98320.0
-  consv_te = 1.
-  do_sat_adj = @[DO_SAT_ADJ]
-  consv_am = .false.
-  fill = .true.
-  dwind_2d = .false.
-  print_freq = 6
-  warm_start = @[WARM_START]
-  no_dycore = .false.
-  z_tracer = .true.
-  agrid_vel_rst = .true.
-  read_increment = @[READ_INCREMENT]
-  res_latlon_dynamics = @[RES_LATLON_DYNAMICS]
-/
-
-&external_ic_nml
-  filtered_terrain = .true.
-  levp = @[NPZP]
-  gfs_dwinds = .true.
-  checker_tr = .false.
-  nt_checker = 0
-/
-
-&gfs_physics_nml
-  fhzero       = @[FHZERO]
-  h2o_phys     = .true.
-  ldiag3d      = @[LDIAG3D]
-  qdiag3d      = @[QDIAG3D]
-  print_diff_pgr = @[PRINT_DIFF_PGR]
-  fhcyc        = @[FHCYC]
-  use_ufo      = .true.
-  pre_rad      = .false.
-  imp_physics  = @[IMP_PHYSICS]
-  iovr         = 3
-  ltaerosol    = @[LTAEROSOL]
-  mraerosol    = @[MRAEROSOL]
-  lradar       = .false.
-  ttendlim     = -999
-  dt_inner     = @[DT_INNER]
-  sedi_semi    = @[SEDI_SEMI]
-  decfl        = @[DECFL]
-  oz_phys      = .false.
-  oz_phys_2015 = .true.
-  lsoil_lsm    = 4
-  do_mynnedmf  = .false.
-  do_mynnsfclay = .false.
-  icloud_bl    = 1
-  bl_mynn_edmf = 1
-  bl_mynn_tkeadvect = .true.
-  bl_mynn_edmf_mom = 1
-  do_ugwp      = .false.
-  do_tofd      = .false.
-  gwd_opt      = @[GWD_OPT]
-  do_ugwp_v0   = @[DO_UGWP_V0]
-  do_ugwp_v1   = @[DO_UGWP_V1]
-  do_ugwp_v0_orog_only = .false.
-  do_ugwp_v0_nst_only  = @[DO_UGWP_V0_NST_ONLY]
-  do_gsl_drag_ls_bl    = @[DO_GSL_DRAG_LS_BL]
-  do_gsl_drag_ss       = @[DO_GSL_DRAG_SS]
-  do_gsl_drag_tofd     = @[DO_GSL_DRAG_TOFD]
-  do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
-  min_lakeice  = 0.15
-  min_seaice   = @[MIN_SEAICE]
-  use_cice_alb = @[USE_CICE_ALB]
-  pdfcld       = .false.
-  fhswr        = 3600.
-  fhlwr        = 3600.
-  ialb         = @[IALB]
-  iems         = @[IEMS]
-  iaer         = @[IAER]
-  icliq_sw     = 2
-  ico2         = 2
-  isubc_sw     = 2
-  isubc_lw     = 2
-  isol         = 2
-  lwhtr        = .true.
-  swhtr        = .true.
-  cnvgwd       = .true.
-  shal_cnv     = .true.
-  cal_pre      = .false.
-  redrag       = .true.
-  dspheat      = .true.
-  hybedmf      = .false.
-  satmedmf     = .true.
-  isatmedmf    = 1
-  lheatstrg    = @[LHEATSTRG]
-  lseaspray    = @[LSEASPRAY]
-  random_clds  = @[RANDOM_CLDS]
-  trans_trac   = .true.
-  cnvcld       = @[CNVCLD]
-  imfshalcnv   = @[IMFSHALCNV]
-  imfdeepcnv   = @[IMFDEEPCNV]
-  ras          = @[RAS]
-  cdmbgwd      = @[CDMBWD]
-  prslrd0      = 0.
-  ivegsrc      = 1
-  isot         = 1
-  lsoil        = 4
-  lsm          = @[LSM]
-  iopt_dveg    = @[IOPT_DVEG]
-  iopt_crs     = @[IOPT_CRS]
-  iopt_btr     = 1
-  iopt_run     = 1
-  iopt_sfc     = @[IOPT_SFC]
-  iopt_trs     = @[IOPT_TRS]
-  iopt_diag    = @[IOPT_DIAG]
-  iopt_frz     = 1
-  iopt_inf     = 1
-  iopt_rad     = @[IOPT_RAD]
-  iopt_alb     = @[IOPT_ALB]
-  iopt_snf     = 4
-  iopt_tbot    = 2
-  iopt_stc     = @[IOPT_STC]
-  debug        = .false.
-  nstf_name    = @[NSTF_NAME]
-  nst_anl      = .true.
-  psautco      = 0.0008,0.0005
-  prautco      = 0.00015,0.00015
-  lgfdlmprad   = @[LGFDLMPRAD]
-  effr_in      = .true.
-  ldiag_ugwp   = @[LDIAG_UGWP]
-  fscav_aero   = @[FSCAV_AERO]
-  do_sppt      = @[DO_SPPT]
-  do_shum      = @[DO_SHUM]
-  do_skeb      = @[DO_SKEB]
-  do_RRTMGP          = @[DO_RRTMGP]
-  active_gases       = 'h2o_co2_o3_n2o_ch4_o2'
-  ngases             = 6
-  lw_file_gas        = 'rrtmgp-data-lw-g128-210809.nc'
-  lw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-lw.nc'
-  sw_file_gas        = 'rrtmgp-data-sw-g112-210809.nc'
-  sw_file_clouds     = 'rrtmgp-cloud-optics-coeffs-sw.nc'
-  rrtmgp_nGptsSW     = 112
-  rrtmgp_nGptsLW     = 128
-  rrtmgp_nBandsLW    = 16
-  rrtmgp_nBandsSW    = 14
-  doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
-  doGP_lwscat        = @[DOGP_LWSCAT]
-  use_med_flux = @[USE_MED_FLUX]
-  frac_grid    = @[FRAC_GRID]
-  cplchm       = @[CPLCHM]
-  cplflx       = @[CPLFLX]
-  cplice       = @[CPLICE]
-  cplwav       = @[CPLWAV]
-  cplwav2atm   = @[CPLWAV2ATM]
-  do_ca        = @[DO_CA]
-  ca_global    = @[CA_GLOBAL]
-  ca_sgs       = @[CA_SGS]
-  nca          = @[NCA]
-  ncells       = @[NCELLS]
-  nlives       = @[NLIVES]
-  nseed        = @[NSEED]
-  nfracseed    = @[NFRACSEED]
-  nthresh      = @[NTHRESH]
-  ca_trigger   = @[CA_TRIGGER]
-  nspinup      = @[NSPINUP]
-  iseed_ca     = @[ISEED_CA]
-  lndp_type    = @[LNDP_TYPE]
-  n_var_lndp   = @[N_VAR_LNDP]
-/
-
-&cires_ugwp_nml
-  knob_ugwp_solver  = 2
-  knob_ugwp_source  = 1,1,0,0
-  knob_ugwp_wvspec  = 1,25,25,25
-  knob_ugwp_azdir   = 2,4,4,4
-  knob_ugwp_stoch   = 0,0,0,0
-  knob_ugwp_effac   = 1,1,1,1
-  knob_ugwp_doaxyz  = 1
-  knob_ugwp_doheat  = 1
-  knob_ugwp_dokdis  = 1
-  knob_ugwp_ndx4lh  = 1
-  knob_ugwp_version = @[KNOB_UGWP_VERSION]
-  launch_level = 54
-/
-
-&gfdl_cloud_microphysics_nml
-  sedi_transport = .true.
-  do_sedi_heat = .false.
-  rad_snow = .true.
-  rad_graupel = .true.
-  rad_rain = .true.
-  const_vi = .false.
-  const_vs = .false.
-  const_vg = .false.
-  const_vr = .false.
-  vi_max = 1.
-  vs_max = 2.
-  vg_max = 12.
-  vr_max = 12.
-  qi_lim = 1.
-  prog_ccn = .false.
-  do_qa = .true.
-  fast_sat_adj = .true.
-  tau_l2v = 225.
-  tau_v2l = 150.
-  tau_g2v = 900.
-  rthresh = 10.e-6  ! This is a key parameter for cloud water
-  dw_land  = 0.16
-  dw_ocean = 0.10
-  ql_gen = 1.0e-3
-  ql_mlt = 1.0e-3
-  qi0_crt = 8.0E-5
-  qs0_crt = 1.0e-3
-  tau_i2s = 1000.
-  c_psaci = 0.05
-  c_pgacs = 0.01
-  rh_inc = 0.30
-  rh_inr = 0.30
-  rh_ins = 0.30
-  ccn_l = 300.
-  ccn_o = 100.
-  c_paut = 0.5
-  c_cracw = 0.8
-  use_ppm = .false.
-  use_ccn = .true.
-  mono_prof = .true.
-  z_slope_liq  = .true.
-  z_slope_ice  = .true.
-  de_ice = .false.
-  fix_negative = .true.
-  icloud_f = 1
-  mp_time = 150.
-  reiflag = 2
-/
-
-&interpolator_nml
-  interp_method = 'conserve_great_circle'
-/
-
-&namsfc
-  FNGLAC   = 'global_glacier.2x2.grb'
-  FNMXIC   = 'global_maxice.2x2.grb'
-  FNTSFC   = 'RTGSST.1982.2012.monthly.clim.grb'
-  FNSNOC   = 'global_snoclim.1.875.grb'
-  FNZORC   = 'igbp'
-  FNALBC   = @[FNALBC]
-  FNALBC2  = @[FNALBC2]
-  FNAISC   = 'IMS-NIC.blended.ice.monthly.clim.grb'
-  FNTG3C   = @[FNTG3C]
-  FNVEGC   = @[FNVEGC]
-  FNVETC   = @[FNVETC]
-  FNSOTC   = @[FNSOTC]
-  FNSOCC   = @[FNSOCC]
-  FNSMCC   = @[FNSMCC]
-  FNMSKH   = @[FNMSKH]
-  FNTSFA   = ''
-  FNACNA   = ''
-  FNSNOA   = ''
-  FNVMNC   = @[FNVMNC]
-  FNVMXC   = @[FNVMXC]
-  FNSLPC   = @[FNSLPC]
-  FNABSC   = @[FNABSC]
-  LDEBUG   =.false.
-  FSMCL(2) = 99999
-  FSMCL(3) = 99999
-  FSMCL(4) = 99999
-  LANDICE  = @[LANDICE]
-  FTSFS    = 90
-  FAISL    = 99999
-  FAISS    = 99999
-  FSNOL    = 99999
-  FSNOS    = 99999
-  FSICL    = @[FSICL]
-  FSICS    = @[FSICS]
-  FTSFL    = 99999
-  FVETL    = 99999
-  FSOTL    = 99999
-  FvmnL    = 99999
-  FvmxL    = 99999
-  FSLPL    = 99999
-  FABSL    = 99999
-/
-
-&fv_grid_nml
-  grid_file = 'INPUT/grid_spec.nc'
-/
-
-&nam_stochy
-/
-
-&nam_sfcperts
-  lndp_type      = @[LNDP_TYPE]
-  lndp_model_type = @[LNDP_MODEL_TYPE]
-  LNDP_TAU=21600,
-  LNDP_LSCALE=500000,
-  ISEED_LNDP=2010,
-  lndp_var_list = @[LNDP_VAR_LIST]
-  lndp_prt_list = @[LNDP_PRT_LIST]
-/
diff --git a/tests/rt.conf b/tests/rt.conf
index 0306052412..58fbdd2d0a 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -145,12 +145,10 @@ RUN | rrfs_v1nssl_nohailnoccn                           |
 
 COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | - noaacloud  | fv3 |
 RUN | control_csawmg                                    | - noaacloud                 | baseline |
-RUN | control_csawmgt                                   | - noaacloud                 | baseline |
 RUN | control_ras                                       | - noaacloud acorn           | baseline |
 
 COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules  | fv3 |
 RUN | control_csawmg                                    | + hera hercules             | baseline |
-RUN | control_csawmgt                                   | + hera hercules             | baseline |
 
 # Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere
 COMPILE | wam | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON | - noaacloud  | fv3 |
@@ -167,7 +165,6 @@ RUN | control_wrtGauss_netcdf_parallel_debug            | - noaacloud
 RUN | control_stochy_debug                              | - noaacloud                  | baseline |
 RUN | control_lndp_debug                                | - noaacloud                  | baseline |
 RUN | control_csawmg_debug                              | - noaacloud                  | baseline |
-RUN | control_csawmgt_debug                             | - noaacloud                  | baseline |
 RUN | control_ras_debug                                 | - noaacloud                  | baseline |
 RUN | control_diag_debug                                | - noaacloud                  | baseline |
 RUN | control_debug_p8                                  | - noaacloud                  | baseline |
@@ -192,8 +189,6 @@ RUN | gnv1_c96_no_nest_debug                            | - noaacloud
 ### DEBUG ATM tests ###
 COMPILE | atm_debug_dyn32 | gnu | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | + hera hercules | fv3 |
 RUN | control_csawmg_debug                              | + hera hercules              | baseline |
-RUN | control_csawmgt_debug                             | + hera hercules              | baseline |
-
 
 COMPILE | wam_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | - noaacloud  | fv3 |
 RUN | control_wam_debug                                 | - noaacloud hercules         | baseline |
@@ -308,11 +303,6 @@ RUN | control_restart_p8_atmlnd                         | - noaacloud
 COMPILE | atmw | intel | -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON | - wcoss2    | fv3 |
 RUN | atmwav_control_noaero_p8                          | - wcoss2                             | baseline |
 
-#connectors (wmesmf)
-COMPILE | atmwm | intel | -DAPP=ATMWM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON | - wcoss2     | fv3 |
-RUN | control_atmwav                                    | - wcoss2                             | baseline |
-#RUN | control_c384gdas_wav                             | - jet derecho wcoss2   noaacloud      | baseline |
-
 ### ATM-GOCART tests ###
 COMPILE | atmaero | intel | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON | - noaacloud    | fv3 |
 RUN | atmaero_control_p8                                | - noaacloud                          | baseline |
diff --git a/tests/rt.sh b/tests/rt.sh
index ce668f4a5a..3e83779720 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -62,10 +62,6 @@ update_rtconf() {
     [[ -s "${NEW_BASELINES_FILE}" ]] || die "${NEW_BASELINES_FILE} is empty, exiting..."
     TEST_WITH_COMPILE=()
     readarray -t TEST_WITH_COMPILE < "${NEW_BASELINES_FILE}"
-  # else USER CHOSE THE -l OPTION
-  elif [[ ${DEFINE_CONF_FILE} == true ]]; then
-    echo "No update needed to TESTS_FILE"
-    return
   # else USER CHOSE THE -n OPTION
   elif [[ ${RUN_SINGLE_TEST} == true ]]; then
     TEST_WITH_COMPILE=("${SRT_NAME} ${SRT_COMPILER}")
@@ -662,6 +658,8 @@ done
 [[ ${KEEP_RUNDIR} == true && ${delete_rundir} == true ]] && die "-k and -d options cannot be used at the same time"
 [[ ${ECFLOW} == true && ${ROCOTO} == true ]] && die "-r and -e options cannot be used at the same time"
 [[ ${CREATE_BASELINE} == true && ${RTPWD_NEW_BASELINE} == true ]] && die "-c and -m options cannot be used at the same time"
+#B&N not run together
+[[ ${NEW_BASELINES_FILE} != '' && ${RUN_SINGLE_TEST} == true ]] && die "-b and -n options cannot be used at the same time"
 
 [[ -o xtrace ]] && set_x='set -x' || set_x='set +x'
 
@@ -723,7 +721,7 @@ case ${MACHINE_ID} in
       # ROCOTOCOMPLETE=$(command -v rocotocomplete)
       ROCOTO_SCHEDULER="slurm"
     fi
-
+    export LD_PRELOAD=/opt/cray/pe/gcc/12.2.0/snos/lib64/libstdc++.so.6
     module load PrgEnv-intel/8.3.3
     module load intel-classic/2023.1.0
     module load cray-mpich/8.1.25
@@ -1028,11 +1026,6 @@ case ${MACHINE_ID} in
 esac
 eval "${set_x}"
 
-# BEFORE MOVING ANY FURTHER LETS CHECK THAT DISKNM/STMP/PTMP ALL EXIST
-[[ -d ${DISKNM} ]] || die "ERROR: DISKNM: ${DISKNM} -- DOES NOT EXIST"
-[[ -d ${STMP} ]] || die "ERROR: STMP: ${STMP} -- DOES NOT EXIST"
-[[ -d ${PTMP} ]] || die "ERROR: PTMP: ${PTMP} -- DOES NOT EXIST"
-
 mkdir -p "${STMP}/${USER}"
 
 NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
@@ -1040,13 +1033,16 @@ NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
 # Overwrite default RUNDIR_ROOT if environment variable RUNDIR_ROOT is set
 RUNDIR_ROOT=${RUNDIR_ROOT:-${PTMP}/${USER}/FV3_RT}/rt_$$
 mkdir -p "${RUNDIR_ROOT}"
-if [[ -L "${PATHRT}/run_dir" && -d "${PATHRT}/run_dir" ]]; then
-  rm "${PATHRT}/run_dir"
-fi
+rm -rf "${PATHRT}/run_dir"
 echo "Linking ${RUNDIR_ROOT} to ${PATHRT}/run_dir"
 ln -s "${RUNDIR_ROOT}" "${PATHRT}/run_dir"
 echo "Run regression test in: ${RUNDIR_ROOT}"
 
+# BEFORE MOVING ANY FURTHER LETS CHECK THAT DISKNM/STMP/PTMP ALL EXIST
+[[ -d ${DISKNM} ]] || die "ERROR: DISKNM: ${DISKNM} -- DOES NOT EXIST"
+[[ -d ${STMP} ]] || die "ERROR: STMP: ${STMP} -- DOES NOT EXIST"
+[[ -d ${PTMP} ]] || die "ERROR: PTMP: ${PTMP} -- DOES NOT EXIST"
+
 update_rtconf
 
 if [[ ${TESTS_FILE} =~ '35d' ]] || [[ ${TESTS_FILE} =~ 'weekly' ]]; then
@@ -1150,7 +1146,7 @@ if [[ ${ROCOTO} == true ]]; then
   <!ENTITY RUNDIR_ROOT    "${RUNDIR_ROOT}">
   <!ENTITY NEW_BASELINE   "${NEW_BASELINE}">
 ]>
-<workflow realtime="F" scheduler="${ROCOTO_SCHEDULER}" taskthrottle="20">
+<workflow realtime="F" scheduler="${ROCOTO_SCHEDULER}" taskthrottle="10">
   <cycledef>197001010000 197001010000 01:00:00</cycledef>
   <log>&LOG;/workflow.log</log>
 EOF
diff --git a/tests/tests/atmaero_control_p8 b/tests/tests/atmaero_control_p8
index f9e0a09b1e..6d4012d580 100644
--- a/tests/tests/atmaero_control_p8
+++ b/tests/tests/atmaero_control_p8
@@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -79,7 +80,6 @@ export WRTTASK_PER_GROUP=${WPG_atmaero}
 # default resources
 export DOMAINS_STACK_SIZE=8000000
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -88,19 +88,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,0,0,0,0
@@ -108,7 +105,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -121,7 +118,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -135,7 +132,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C96.facsf.tileX.nc'"
@@ -166,7 +162,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone)
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -175,8 +171,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
@@ -185,4 +180,3 @@ export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
 export SATMEDMF=.true.
-
diff --git a/tests/tests/atmaero_control_p8_rad b/tests/tests/atmaero_control_p8_rad
index 05ac7156b7..4eac5a3303 100644
--- a/tests/tests/atmaero_control_p8_rad
+++ b/tests/tests/atmaero_control_p8_rad
@@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -74,7 +75,6 @@ export coupling_interval_sec=${DT_ATMOS}
 # default resources
 export DOMAINS_STACK_SIZE=8000000
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -83,19 +83,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=2011
 export NSTF_NAME=2,0,0,0,0
@@ -103,7 +100,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.true.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -116,7 +113,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -130,7 +127,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C96.facsf.tileX.nc'"
@@ -161,7 +157,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -170,8 +166,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
@@ -180,4 +175,3 @@ export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
 export SATMEDMF=.true.
-
diff --git a/tests/tests/atmaero_control_p8_rad_micro b/tests/tests/atmaero_control_p8_rad_micro
index c2a4171008..1c4bbe4478 100644
--- a/tests/tests/atmaero_control_p8_rad_micro
+++ b/tests/tests/atmaero_control_p8_rad_micro
@@ -51,6 +51,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -74,7 +75,6 @@ export coupling_interval_sec=${DT_ATMOS}
 # default resources
 export DOMAINS_STACK_SIZE=8000000
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -83,19 +83,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.false.
 export LTAEROSOL=.false.
 export MRAEROSOL=.true.
@@ -105,7 +102,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.true.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -118,7 +115,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -132,7 +129,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C96.facsf.tileX.nc'"
@@ -161,7 +157,7 @@ export DZ_MIN=6
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -170,8 +166,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_aero_tke_GOCART
 export DIAG_TABLE=diag_table_p8_gocart_micro
-# use same namelist for standalone,coupled P7
-export INPUT_NML=merra2_thompson.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/atmwav_control_noaero_p8 b/tests/tests/atmwav_control_noaero_p8
index 9924a60ff9..19a8523c93 100644
--- a/tests/tests/atmwav_control_noaero_p8
+++ b/tests/tests/atmwav_control_noaero_p8
@@ -50,6 +50,7 @@ export LIST_FILES="sfcf000.nc \
                    ufs.atmw.ww3.r.2021-03-22-64800"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -90,7 +91,6 @@ export CMEPS_RESTART_DIR=./RESTART/
 export cap_dbug_flag=0
 export pio_rearranger=box
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -100,26 +100,23 @@ export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
 
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -132,7 +129,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -146,7 +143,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C96.facsf.tileX.nc'"
@@ -183,7 +179,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -193,8 +189,7 @@ export CCPP_SUITE=FV3_GFS_v17_p8
 
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_2threads_p8 b/tests/tests/control_2threads_p8
index 4099ddf3d1..00dfea7e15 100644
--- a/tests/tests/control_2threads_p8
+++ b/tests/tests/control_2threads_p8
@@ -50,6 +50,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -66,7 +67,6 @@ export JNPES=$JNPES_thrd
 
 export atm_omp_num_threads=2
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -75,19 +75,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -95,7 +92,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -108,7 +105,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -122,7 +119,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C96.facsf.tileX.nc'"
@@ -153,7 +149,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -162,10 +158,9 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
-# P8 RRTMGP
+# RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
diff --git a/tests/tests/control_CubedSphereGrid b/tests/tests/control_CubedSphereGrid
index 74eb30485c..772432a196 100644
--- a/tests/tests/control_CubedSphereGrid
+++ b/tests/tests/control_CubedSphereGrid
@@ -33,6 +33,7 @@ export LIST_FILES="sfcf000.tile1.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc"
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -49,5 +50,5 @@ export IOVR=3
 export WRITE_DOPOST=.false.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_CubedSphereGrid_debug b/tests/tests/control_CubedSphereGrid_debug
index 531b75d1d1..93681bb8a2 100644
--- a/tests/tests/control_CubedSphereGrid_debug
+++ b/tests/tests/control_CubedSphereGrid_debug
@@ -34,6 +34,7 @@ export LIST_FILES="sfcf000.tile1.nc \
                    atmf001.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -49,5 +50,5 @@ export IOVR=3
 export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_CubedSphereGrid_parallel b/tests/tests/control_CubedSphereGrid_parallel
index eec8725429..45963ad8f5 100644
--- a/tests/tests/control_CubedSphereGrid_parallel
+++ b/tests/tests/control_CubedSphereGrid_parallel
@@ -22,6 +22,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF24"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -40,6 +41,5 @@ export HISTORY_FILE_ON_NATIVE_GRID=.true.
 export WRITE_DOPOST=.true.
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
-export DIAG_TABLE=diag_table_gfsv16_3d_soil
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_atmwav b/tests/tests/control_atmwav
deleted file mode 100644
index 25dbf67628..0000000000
--- a/tests/tests/control_atmwav
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-#
-#  Global control with 2way atm-wav coupling test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control with 2way atm-wav coupling results with previous trunk version"
-
-export CNTL_DIR=control_atmwav
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf012.nc \
-                   atmf000.nc \
-                   atmf012.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF12 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF12 \
-                   RESTART/20210322.180000.coupler.res \
-                   RESTART/20210322.180000.fv_core.res.nc \
-                   RESTART/20210322.180000.fv_core.res.tile1.nc \
-                   RESTART/20210322.180000.fv_core.res.tile2.nc \
-                   RESTART/20210322.180000.fv_core.res.tile3.nc \
-                   RESTART/20210322.180000.fv_core.res.tile4.nc \
-                   RESTART/20210322.180000.fv_core.res.tile5.nc \
-                   RESTART/20210322.180000.fv_core.res.tile6.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc \
-                   RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile1.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile2.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile3.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile4.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile5.nc \
-                   RESTART/20210322.180000.fv_tracer.res.tile6.nc \
-                   RESTART/20210322.180000.phy_data.tile1.nc \
-                   RESTART/20210322.180000.phy_data.tile2.nc \
-                   RESTART/20210322.180000.phy_data.tile3.nc \
-                   RESTART/20210322.180000.phy_data.tile4.nc \
-                   RESTART/20210322.180000.phy_data.tile5.nc \
-                   RESTART/20210322.180000.phy_data.tile6.nc \
-                   RESTART/20210322.180000.sfc_data.tile1.nc \
-                   RESTART/20210322.180000.sfc_data.tile2.nc \
-                   RESTART/20210322.180000.sfc_data.tile3.nc \
-                   RESTART/20210322.180000.sfc_data.tile4.nc \
-                   RESTART/20210322.180000.sfc_data.tile5.nc \
-                   RESTART/20210322.180000.sfc_data.tile6.nc \
-                   20210322.180000.restart.glo_1deg"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export DT_ATMOS=600
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-export IAER=5111
-export IOVR=3
-
-export FHMAX=12
-#wave
-export WW3_RSTDTHR=3
-export WW3_DT_2_RST="$(printf "%02d" $(( ${WW3_RSTDTHR}*3600 )))"
-
-export INPES=$INPES_cpl_atmw
-export JNPES=$JNPES_cpl_atmw
-export atm_omp_num_threads=$THRD_cpl_atmw
-export WRTTASK_PER_GROUP=$WPG_cpl_atmw
-
-export WAV_tasks=$WAV_tasks_cpl_atmw
-
-export CPL=.true.
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export atm_model='fv3'
-export wav_model='ww3'
-export coupling_interval_sec=600
-export UFS_CONFIGURE="ufs.configure.blocked_atm_wav_2way.IN"
-export WW3_MODDEF=mod_def.glo_1deg
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
diff --git a/tests/tests/control_c192 b/tests/tests/control_c192
index 16af34ee94..9ca7c3ace7 100644
--- a/tests/tests/control_c192
+++ b/tests/tests/control_c192
@@ -17,7 +17,10 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF24"
 
+export ATMRES=C192
+
 export_fv3
+export_tiled
 export INPES=4
 export WRTTASK_PER_GROUP=12
 export NPZ=127
@@ -39,11 +42,6 @@ export IOVR=3
 export IMO=768
 export JMO=384
 
-export FNALBC="'global_snowfree_albedo.bosu.t382.768.384.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t382.768.384.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"
-
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
index 3488b81191..ed42237a87 100644
--- a/tests/tests/control_c384
+++ b/tests/tests/control_c384
@@ -17,7 +17,10 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF12"
 
+export ATMRES=C384
+
 export_fv3
+export_tiled
 export atm_omp_num_threads=${THRD_c384}
 export INPES=${INPES_c384}
 export JNPES=${JNPES_c384}
@@ -44,14 +47,9 @@ export IMO=1536
 export JMO=768
 export OUTPUT_FH="6 -1"
 
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
 
 if [[ $MACHINE_ID = jet ]]; then 
   TPN=18
diff --git a/tests/tests/control_c384gdas b/tests/tests/control_c384gdas
index 4b6ac9fc26..77ff247551 100644
--- a/tests/tests/control_c384gdas
+++ b/tests/tests/control_c384gdas
@@ -49,7 +49,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210322.060000.sfc_data.tile5.nc \
                    RESTART/20210322.060000.sfc_data.tile6.nc"
 
-export_fv3
+export_fv3_v16
 export atm_omp_num_threads=${THRD_c384}
 export INPES=${INPES_c384}
 export JNPES=${JNPES_c384}
diff --git a/tests/tests/control_c384gdas_wav b/tests/tests/control_c384gdas_wav
deleted file mode 100644
index 3669edccb0..0000000000
--- a/tests/tests/control_c384gdas_wav
+++ /dev/null
@@ -1,126 +0,0 @@
-###############################################################################
-#
-#  Global control test: GFSv16 gdas ensemble forecast case
-#
-###############################################################################
-
-export TEST_DESCR="Compare global c384gdas_wave results with previous trunk version"
-
-export CNTL_DIR=control_c384gdas_wav
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf003.nc \
-                   atmf000.nc \
-                   atmf003.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF03 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF03 \
-                   RESTART/20210322.030000.coupler.res \
-                   RESTART/20210322.030000.fv_core.res.nc \
-                   RESTART/20210322.030000.fv_core.res.tile1.nc \
-                   RESTART/20210322.030000.fv_core.res.tile2.nc \
-                   RESTART/20210322.030000.fv_core.res.tile3.nc \
-                   RESTART/20210322.030000.fv_core.res.tile4.nc \
-                   RESTART/20210322.030000.fv_core.res.tile5.nc \
-                   RESTART/20210322.030000.fv_core.res.tile6.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile1.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile2.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile3.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile4.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile5.nc \
-                   RESTART/20210322.030000.fv_srf_wnd.res.tile6.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile1.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile2.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile3.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile4.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile5.nc \
-                   RESTART/20210322.030000.fv_tracer.res.tile6.nc \
-                   RESTART/20210322.030000.phy_data.tile1.nc \
-                   RESTART/20210322.030000.phy_data.tile2.nc \
-                   RESTART/20210322.030000.phy_data.tile3.nc \
-                   RESTART/20210322.030000.phy_data.tile4.nc \
-                   RESTART/20210322.030000.phy_data.tile5.nc \
-                   RESTART/20210322.030000.phy_data.tile6.nc \
-                   RESTART/20210322.030000.sfc_data.tile1.nc \
-                   RESTART/20210322.030000.sfc_data.tile2.nc \
-                   RESTART/20210322.030000.sfc_data.tile3.nc \
-                   RESTART/20210322.030000.sfc_data.tile4.nc \
-                   RESTART/20210322.030000.sfc_data.tile5.nc \
-                   RESTART/20210322.030000.sfc_data.tile6.nc \
-                   20210322.030000.restart.aoc_9km \
-                   20210322.030000.restart.gnh_10m \
-                   20210322.030000.restart.gsh_15m"
-
-export_fv3
-
-export FHMAX=9
-export NPZ=127
-export NPZP=128
-export NPX=385
-export NPY=385
-export DT_ATMOS=225
-
-export INPES=$INPES_cpl_atmw_gdas
-export JNPES=$JNPES_cpl_atmw_gdas
-export atm_omp_num_threads=$THRD_cpl_atmw_gdas
-export WRTTASK_PER_GROUP=$WPG_cpl_atmw_gdas
-
-WAV_tasks=${WAV_tasks_atmw_gdas}
-
-export SYEAR=2021
-export SMONTH=03
-export SDAY=21
-export SHOUR=18
-export FHROT=3
-export OUTPUT_FH="3 -1"
-export IAU_OFFSET=6
-export CDMBWD=${CDMBWD_c384}
-export OUTPUT_GRID='gaussian_grid'
-export WRITE_DOPOST=.true.
-export IMO=1536
-export JMO=768
-
-export WARM_START=.true.
-export NGGPS_IC=.false.
-export EXTERNAL_IC=.false.
-export MAKE_NH=.false.
-export MOUNTAIN=.true.
-export NA_INIT=0
-export IAU_INC_FILES="'fv_increment3.nc','fv_increment6.nc','fv_increment9.nc'"
-export MODEL_INITIALIZATION=true
-
-export FNALBC="'global_snowfree_albedo.bosu.t766.1536.768.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t766.1536.768.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t766.1536.768.rg.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t766.1536.768.rg.grb',"
-
-export CPL=.true.
-export CPLWAV=.true.
-export UFS_CONFIGURE="ufs.configure.leapfrog_atm_wav_esmf.IN"
-export atm_model='fv3'
-export wav_model='ww3'
-export WW3OUTPUTTYPE=' 1'
-export coupling_interval_sec=1800.0  #coupling time step, want it to be multiple of 1800 and FV3 time step
-#wave
-export WW3_RSTDTHR=9
-export WW3_DT_2_RST="$(printf "%02d" $(( ${WW3_RSTDTHR}*3600 )))"
-export NFGRIDS=1
-export NMGRIDS=3
-export CPLILINE="'glo_15mxt'  F F T F F F F F F"
-export WW3GRIDLINE="'gnh_10m' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 1 10  0.00 1.00  F
-'gsh_15m' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 2 20  0.00 1.00  F
-'aoc_9km' 'no' 'no' 'CPL:glo_15mxt' 'no'  'no' 'no' 'no' 'no' 'no' 3 30  0.00 1.00  F"
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-export OUT_BEG=$RUN_BEG
-export OUT_END=$RUN_END
-export RST_BEG=$RUN_BEG
-export RST_2_BEG=$RUN_BEG
-export RST_END=$RUN_END
-export RST_2_END=$RUN_END
-
-export MODEL_INITIALIZATION=true
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control_gdas.nml.IN
diff --git a/tests/tests/control_c48 b/tests/tests/control_c48
index ab76dd503b..9ffa2ce490 100644
--- a/tests/tests/control_c48
+++ b/tests/tests/control_c48
@@ -46,6 +46,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 
 export INPES=1
 export JNPES=1
@@ -70,14 +71,11 @@ export IOVR=3
 export IMO=192
 export JMO=94
 
-export FNALBC="'global_snowfree_albedo.bosu.t62.192.94.rg.grb',"
-export FNVETC="'global_vegtype.igbp.t62.192.94.rg.grb',"
-export FNSOTC="'global_soiltype.statsgo.t62.192.94.rg.grb',"
-export FNABSC="'global_mxsnoalb.uariz.t62.192.94.rg.grb',"
-export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb',"
-export FNMSKH_control="'global_slmask.t62.192.94.grb',"
-
+export FNSMCC_control="'global_soilmgldas.statsgo.t92.192.94.grb'"
+export FNMSKH_control="'global_slmask.t62.192.94.grb'"
+export FNSMCC=${FNSMCC_control}
+export FNMSKH=${FNMSKH_control}
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_c48.v2.sfc b/tests/tests/control_c48.v2.sfc
index 9e435d8aaa..e2b16a3c25 100644
--- a/tests/tests/control_c48.v2.sfc
+++ b/tests/tests/control_c48.v2.sfc
@@ -45,7 +45,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile5.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
-export_fv3
+export_fv3_v16
 
 export INPES=1
 export JNPES=1
diff --git a/tests/tests/control_c768 b/tests/tests/control_c768
index 59b32e456e..7794c7dfed 100644
--- a/tests/tests/control_c768
+++ b/tests/tests/control_c768
@@ -17,8 +17,10 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF03"
 
-export_fv3
+export ATMRES=C768
 
+export_fv3
+export_tiled
 export INPES=${INPES_c768}
 export JNPES=${JNPES_c768}
 export atm_omp_num_threads=${THRD_c768}
diff --git a/tests/tests/control_csawmg b/tests/tests/control_csawmg
index a5428a2653..af42aac9f6 100644
--- a/tests/tests/control_csawmg
+++ b/tests/tests/control_csawmg
@@ -17,7 +17,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF24"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export SYEAR=2021
diff --git a/tests/tests/control_csawmg_debug b/tests/tests/control_csawmg_debug
index f2379211d2..26ece68145 100644
--- a/tests/tests/control_csawmg_debug
+++ b/tests/tests/control_csawmg_debug
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf000.nc \
                    atmf001.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export SYEAR=2021
diff --git a/tests/tests/control_csawmgt b/tests/tests/control_csawmgt
deleted file mode 100644
index 9ee2f25e90..0000000000
--- a/tests/tests/control_csawmgt
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-#
-#  Global control csawmgt test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control csawmgt results with previous trunk version"
-
-export CNTL_DIR=control_csawmgt
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf024.nc \
-                   atmf000.nc \
-                   atmf024.nc \
-                   GFSFLX.GrbF00 \
-                   GFSFLX.GrbF24 \
-                   GFSPRS.GrbF00 \
-                   GFSPRS.GrbF24"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export RESTART_INTERVAL=0
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export WRITE_DOPOST=.true.
-
-export DT_ATMOS=450
-export IAER=111
-export DIAG_TABLE='diag_table_aod'
-export FIELD_TABLE='field_table_csawmgshoc'
-export USE_MERRA2=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_csawmg
-export INPUT_NML=control_csawmg.nml.IN
diff --git a/tests/tests/control_csawmgt_debug b/tests/tests/control_csawmgt_debug
deleted file mode 100644
index a1f867e000..0000000000
--- a/tests/tests/control_csawmgt_debug
+++ /dev/null
@@ -1,36 +0,0 @@
-###############################################################################
-#
-#  Global control csawmgt debug test
-#
-###############################################################################
-
-export TEST_DESCR="Compare global control csawmgt debug results with previous trunk version"
-
-export CNTL_DIR=control_csawmgt_debug
-
-export LIST_FILES="sfcf000.nc \
-                   sfcf001.nc \
-                   atmf000.nc \
-                   atmf001.nc"
-
-export_fv3
-export NPZ=127
-export NPZP=128
-export SYEAR=2021
-export SMONTH=03
-export SDAY=22
-export SHOUR=06
-export OUTPUT_GRID='gaussian_grid'
-export NSTF_NAME='2,0,0,0,0'
-export FHMAX=01
-export OUTPUT_FH="0 1"
-
-export DT_ATMOS=450
-export IAER=111
-export DIAG_TABLE='diag_table_aod'
-export FIELD_TABLE='field_table_csawmgshoc'
-export USE_MERRA2=.true.
-
-export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16_csawmg
-export INPUT_NML=control_csawmg.nml.IN
diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8
index 777e566155..c5f823c4b2 100644
--- a/tests/tests/control_debug_p8
+++ b/tests/tests/control_debug_p8
@@ -14,6 +14,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf001.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -25,9 +26,7 @@ export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export FHMAX=1
 export OUTPUT_FH="0 1"
-#export WRITE_DOPOST=.true.
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -36,19 +35,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -56,7 +52,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -69,7 +65,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -83,25 +79,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -114,7 +91,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -123,10 +100,9 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
-# P8 RRTMGP
+# RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
diff --git a/tests/tests/control_decomp_p8 b/tests/tests/control_decomp_p8
index 3b5cbb9732..e9f22a92c0 100644
--- a/tests/tests/control_decomp_p8
+++ b/tests/tests/control_decomp_p8
@@ -50,6 +50,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -66,7 +67,6 @@ export OUTPUT_FH='0 21 24'
 export INPES=6
 export JNPES=4
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -75,19 +75,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -95,7 +92,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -108,7 +105,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -122,22 +119,7 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
 export FSICL=0
 export FSICS=0
 
@@ -153,7 +135,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -162,10 +144,9 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
-# P8 RRTMGP
+# RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
diff --git a/tests/tests/control_diag_debug b/tests/tests/control_diag_debug
index 7d2004bece..13fe68ce35 100644
--- a/tests/tests/control_diag_debug
+++ b/tests/tests/control_diag_debug
@@ -14,6 +14,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf001.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -29,8 +30,8 @@ export FHMAX=1
 export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
 
 export FHZERO=1
 export LDIAG3D=.true.
diff --git a/tests/tests/control_flake b/tests/tests/control_flake
index 20428c49a9..0cba0cedf1 100644
--- a/tests/tests/control_flake
+++ b/tests/tests/control_flake
@@ -17,7 +17,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF24"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_flake_debug b/tests/tests/control_flake_debug
index f9d0f551ca..f23f4207a0 100644
--- a/tests/tests/control_flake_debug
+++ b/tests/tests/control_flake_debug
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf000.nc \
                    atmf001.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -23,7 +23,7 @@ export SDAY=22
 export SHOUR=06
 export OUTPUT_GRID='gaussian_grid'
 export NSTF_NAME='2,0,0,0,0'
-#export WRITE_DOPOST=.true.
+export WRITE_DOPOST=.true.
 export IAER=5111
 export FHMAX=1
 export OUTPUT_FH="0 1"
diff --git a/tests/tests/control_iovr4 b/tests/tests/control_iovr4
index 123579d3b7..4cd5b68e4a 100644
--- a/tests/tests/control_iovr4
+++ b/tests/tests/control_iovr4
@@ -21,7 +21,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF21 \
                    GFSPRS.GrbF24"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_iovr5 b/tests/tests/control_iovr5
index db10f3f451..7c288459a5 100644
--- a/tests/tests/control_iovr5
+++ b/tests/tests/control_iovr5
@@ -21,7 +21,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF21 \
                    GFSPRS.GrbF24"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_latlon b/tests/tests/control_latlon
index d72143dc24..a46b819168 100644
--- a/tests/tests/control_latlon
+++ b/tests/tests/control_latlon
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF24"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -36,5 +37,5 @@ export OUTPUT_FH='0 24'
 
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_lndp b/tests/tests/control_lndp
index 51366f41ab..ab1ea0a8ca 100644
--- a/tests/tests/control_lndp
+++ b/tests/tests/control_lndp
@@ -17,7 +17,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF12"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_lndp_debug b/tests/tests/control_lndp_debug
index b47630da54..609050f57b 100644
--- a/tests/tests/control_lndp_debug
+++ b/tests/tests/control_lndp_debug
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf000.nc \
                    atmf001.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_noqr_p8 b/tests/tests/control_noqr_p8
index 8ed8408308..dd3cd82113 100644
--- a/tests/tests/control_noqr_p8
+++ b/tests/tests/control_noqr_p8
@@ -54,6 +54,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -68,7 +69,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -77,19 +77,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -97,7 +94,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -110,7 +107,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -124,25 +121,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -155,7 +133,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -164,8 +142,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_p8 b/tests/tests/control_p8
index 9fa9badfbd..26ab79b7fb 100644
--- a/tests/tests/control_p8
+++ b/tests/tests/control_p8
@@ -54,6 +54,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -67,7 +68,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -96,7 +93,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -109,7 +106,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -123,25 +120,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,8 +141,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_p8.v2.sfc b/tests/tests/control_p8.v2.sfc
index 3f0c360b53..d08987ae87 100644
--- a/tests/tests/control_p8.v2.sfc
+++ b/tests/tests/control_p8.v2.sfc
@@ -55,6 +55,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -68,7 +69,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -77,19 +77,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -97,7 +94,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -110,7 +107,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -124,25 +121,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -155,7 +133,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -164,8 +142,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export V2_SFC_FILE=true
 
 # RRTMGP
diff --git a/tests/tests/control_p8_atmlnd b/tests/tests/control_p8_atmlnd
index 46d6745e30..aecdf87e6f 100644
--- a/tests/tests/control_p8_atmlnd
+++ b/tests/tests/control_p8_atmlnd
@@ -96,6 +96,7 @@ export LIST_FILES="sfcf000.tile1.nc \
                    ufs.cpld.lnd.out.2021-03-23-21600.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -109,7 +110,6 @@ export OUTPUT_GRID='cubed_sphere_grid'
 export WRITE_DOPOST=.false.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -118,19 +118,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -138,7 +135,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -151,7 +148,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -165,7 +162,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'INPUT/C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'INPUT/C96.facsf.tileX.nc'"
@@ -174,6 +170,8 @@ export FNVEGC="'INPUT/C96.vegetation_greenness.tileX.nc'"
 export FNVETC="'INPUT/C96.vegetation_type.tileX.nc'"
 export FNSOTC="'INPUT/C96.soil_type.tileX.nc'"
 export FNSOCC="'INPUT/C96.soil_color.tileX.nc'"
+export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
+export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
 export FNSMCC=${FNSMCC_control}
 export FNMSKH=${FNMSKH_control}
 export FNVMNC="'INPUT/C96.vegetation_greenness.tileX.nc'"
@@ -196,7 +194,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -205,8 +203,7 @@ export FV3_RUN="control_run.IN noahmp_run.IN"
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_p8_atmlnd_sbs b/tests/tests/control_p8_atmlnd_sbs
index 704f7936f4..33be5a8b0c 100644
--- a/tests/tests/control_p8_atmlnd_sbs
+++ b/tests/tests/control_p8_atmlnd_sbs
@@ -96,6 +96,7 @@ export LIST_FILES="sfcf000.tile1.nc \
                    ufs.cpld.lnd.out.2021-03-23-21600.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -109,7 +110,6 @@ export OUTPUT_GRID='cubed_sphere_grid'
 export WRITE_DOPOST=.false.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -118,19 +118,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -138,7 +135,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -151,7 +148,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -165,7 +162,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'INPUT/C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'INPUT/C96.facsf.tileX.nc'"
@@ -196,7 +192,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -205,8 +201,7 @@ export FV3_RUN="control_run.IN noahmp_run.IN"
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_p8_faster b/tests/tests/control_p8_faster
index 21b3dda5db..fd02cbf4e0 100644
--- a/tests/tests/control_p8_faster
+++ b/tests/tests/control_p8_faster
@@ -54,6 +54,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -67,7 +68,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -96,7 +93,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -109,7 +106,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -123,25 +120,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,8 +141,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_p8_lndp b/tests/tests/control_p8_lndp
index 80c4be94be..4f5742b448 100644
--- a/tests/tests/control_p8_lndp
+++ b/tests/tests/control_p8_lndp
@@ -26,6 +26,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF48"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -40,7 +41,6 @@ export WRITE_DOPOST=.true.
 export FHMAX=48
 export OUTPUT_FH='0 21 24 48'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -49,19 +49,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -69,7 +66,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -82,7 +79,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -96,25 +93,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -127,7 +105,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -136,8 +114,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export LNDP_TYPE=2
 export N_VAR_LNDP=1
 export LNDP_VAR_LIST="'vgf',"
diff --git a/tests/tests/control_p8_mynn b/tests/tests/control_p8_mynn
index b61adef27d..593b283f63 100644
--- a/tests/tests/control_p8_mynn
+++ b/tests/tests/control_p8_mynn
@@ -53,7 +53,8 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile5.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
-export_fv3
+export_fv3_v16
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -67,7 +68,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -96,7 +93,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -109,7 +106,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -123,25 +120,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,8 +141,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8_mynn
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
@@ -175,3 +152,24 @@ export DOGP_SGS_CNV=.true.
 export IMFSHALCNV=-1
 export SHAL_CNV=.false.
 export DO_MYNNEDMF=.true.
+
+export TILEDFIX=.true.
+export FNALBC="'C96.snowfree_albedo.tileX.nc'"
+export FNALBC2="'C96.facsf.tileX.nc'"
+export FNTG3C="'C96.substrate_temperature.tileX.nc'"
+export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
+export FNVETC="'C96.vegetation_type.tileX.nc'"
+export FNSOTC="'C96.soil_type.tileX.nc'"
+export FNSOCC="'C96.soil_color.tileX.nc'"
+export FNSMCC=${FNSMCC_control}
+export FNMSKH=${FNMSKH_control}
+export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
+export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
+export FNSLPC="'C96.slope_type.tileX.nc'"
+export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
+export LANDICE=".false."
+export FSICL=0
+export FSICS=0
+
+export IOVR=3
+export ICLIQ_SW=2
diff --git a/tests/tests/control_p8_rrtmgp b/tests/tests/control_p8_rrtmgp
index b5a93a9580..01daa2ee7a 100644
--- a/tests/tests/control_p8_rrtmgp
+++ b/tests/tests/control_p8_rrtmgp
@@ -54,6 +54,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -67,7 +68,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -96,7 +93,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -109,7 +106,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -123,25 +120,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,8 +141,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8_rrtmgp
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.true.
diff --git a/tests/tests/control_p8_ugwpv1 b/tests/tests/control_p8_ugwpv1
index a8f550c2ec..a62a9c1049 100644
--- a/tests/tests/control_p8_ugwpv1
+++ b/tests/tests/control_p8_ugwpv1
@@ -55,6 +55,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -68,7 +69,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -77,19 +77,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,1,0,0,0
@@ -97,7 +94,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P8 UGWP1
+# UGWP1
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.
@@ -113,7 +110,7 @@ export LDIAG_UGWP=.false.
 export KNOB_UGWP_DOKDIS=2
 export KNOB_UGWP_NDX4LH=4
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -127,25 +124,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -158,7 +136,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Follwoing not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -167,8 +145,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_ras b/tests/tests/control_ras
index f762518af9..2d730bb52e 100644
--- a/tests/tests/control_ras
+++ b/tests/tests/control_ras
@@ -17,7 +17,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF24"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_ras_debug b/tests/tests/control_ras_debug
index d34b86b816..14b248269f 100644
--- a/tests/tests/control_ras_debug
+++ b/tests/tests/control_ras_debug
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf000.nc \
                    atmf001.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
diff --git a/tests/tests/control_restart_noqr_p8 b/tests/tests/control_restart_noqr_p8
index 424f4d43ae..f3baca99f7 100644
--- a/tests/tests/control_restart_noqr_p8
+++ b/tests/tests/control_restart_noqr_p8
@@ -46,6 +46,7 @@ export LIST_FILES="sfcf024.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -67,7 +68,6 @@ export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export NA_INIT=0
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,0,0,0,0
@@ -96,7 +93,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -109,7 +106,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -123,25 +120,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,10 +141,9 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
-# P8 RRTMGP
+# RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
diff --git a/tests/tests/control_restart_p8 b/tests/tests/control_restart_p8
index c10d7e7a93..50be1ec0dd 100644
--- a/tests/tests/control_restart_p8
+++ b/tests/tests/control_restart_p8
@@ -46,6 +46,7 @@ export LIST_FILES="sfcf024.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -66,7 +67,6 @@ export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export NA_INIT=0
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -75,19 +75,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,0,0,0,0
@@ -95,7 +92,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -108,7 +105,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -122,25 +119,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -153,7 +131,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -162,10 +140,9 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
-# P8 RRTMGP
+# RRTMGP
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
diff --git a/tests/tests/control_restart_p8_atmlnd b/tests/tests/control_restart_p8_atmlnd
index e4e0f3ab2f..2eaa04f779 100644
--- a/tests/tests/control_restart_p8_atmlnd
+++ b/tests/tests/control_restart_p8_atmlnd
@@ -28,6 +28,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    ufs.cpld.lnd.out.2021-03-23-21600.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -49,7 +50,6 @@ export MAKE_NH=.false.
 export MOUNTAIN=.true.
 export NA_INIT=0
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -58,19 +58,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export IAER=1011
 export NSTF_NAME=2,0,0,0,0
@@ -78,7 +75,7 @@ export NSTF_NAME=2,0,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -91,7 +88,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -105,7 +102,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
 export TILEDFIX=.true.
 export FNALBC="'INPUT/C96.snowfree_albedo.tileX.nc'"
 export FNALBC2="'INPUT/C96.facsf.tileX.nc'"
@@ -136,7 +132,7 @@ export FRAC_GRID=.true.
 export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
 export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -145,8 +141,7 @@ export FV3_RUN="control_run.IN noahmp_run.IN"
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_thompson_noaero_tke
 export DIAG_TABLE=diag_table_cpld.IN
-# use same namelist for standalone,coupled P7
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/control_stochy b/tests/tests/control_stochy
index 1eefdaecff..2c1cbf1ddd 100644
--- a/tests/tests/control_stochy
+++ b/tests/tests/control_stochy
@@ -17,7 +17,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF00 \
                    GFSPRS.GrbF12"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=600
diff --git a/tests/tests/control_stochy_debug b/tests/tests/control_stochy_debug
index 0aafc10685..82f9866232 100644
--- a/tests/tests/control_stochy_debug
+++ b/tests/tests/control_stochy_debug
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf000.nc \
                    atmf001.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=600
diff --git a/tests/tests/control_stochy_restart b/tests/tests/control_stochy_restart
index 7f8d532776..77be313478 100644
--- a/tests/tests/control_stochy_restart
+++ b/tests/tests/control_stochy_restart
@@ -13,7 +13,7 @@ export LIST_FILES="sfcf012.nc \
                    GFSFLX.GrbF12 \
                    GFSPRS.GrbF12 "
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=600
diff --git a/tests/tests/control_wam b/tests/tests/control_wam
index ce4499d7de..1b3b7d1543 100644
--- a/tests/tests/control_wam
+++ b/tests/tests/control_wam
@@ -11,7 +11,7 @@ export CNTL_DIR=control_wam
 export LIST_FILES="sfcf024.nc \
                    atmf024.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=149
 export NPZP=150
 export DT_ATMOS="225"
diff --git a/tests/tests/control_wam_debug b/tests/tests/control_wam_debug
index 6d000e0752..8743e90f83 100644
--- a/tests/tests/control_wam_debug
+++ b/tests/tests/control_wam_debug
@@ -11,7 +11,7 @@ export CNTL_DIR=control_wam_debug
 export LIST_FILES="sfcf019.nc \
                    atmf019.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=149
 export NPZP=150
 export DT_ATMOS="225"
@@ -22,7 +22,6 @@ export SHOUR="06"
 
 export FHMAX=19
 export OUTPUT_FH="0 19"
-#export WRITE_DOPOST=.true.
 
 export WARM_START=.true.
 export NA_INIT=0
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel
index de957a2eb8..d90184da4d 100644
--- a/tests/tests/control_wrtGauss_netcdf_parallel
+++ b/tests/tests/control_wrtGauss_netcdf_parallel
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf000.nc \
                    GFSPRS.GrbF24"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -35,5 +36,5 @@ export IDEFLATE=1
 export QUANTIZE_NSD=14
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
index b4a1902574..2988ec0782 100644
--- a/tests/tests/control_wrtGauss_netcdf_parallel_debug
+++ b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -14,6 +14,7 @@ export LIST_FILES="sfcf000.nc \
                    atmf001.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=720
@@ -32,5 +33,5 @@ export QUANTIZE_NSD=14
 export OUTPUT_FH="0 1"
 
 export FV3_RUN=control_run.IN
-export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=control.nml.IN
+export CCPP_SUITE=FV3_GFS_v17_p8
+export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
index 912c850466..890ff98596 100644
--- a/tests/tests/cpld_control_gfsv17
+++ b/tests/tests/cpld_control_gfsv17
@@ -90,7 +90,7 @@ WAV_tasks=$WAV_tasks_cpl_unstr
 export atm_omp_num_threads=$THRD_cpl_unstr
 export med_omp_num_threads=$atm_omp_num_threads
 
-# P8 UGWP1
+# UGWP1
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.
@@ -118,7 +118,7 @@ export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
 export DIAG_TABLE=diag_table_cpld.IN
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 #GFSv17	settings
diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
index 83e193208a..6ebbf0047a 100644
--- a/tests/tests/cpld_control_gfsv17_iau
+++ b/tests/tests/cpld_control_gfsv17_iau
@@ -97,7 +97,7 @@ WAV_tasks=$WAV_tasks_cpl_unstr
 export atm_omp_num_threads=$THRD_cpl_unstr
 export med_omp_num_threads=$atm_omp_num_threads
 
-# P8 UGWP1
+# UGWP1
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.
@@ -121,7 +121,7 @@ export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
 export DIAG_TABLE=diag_table_cpld.IN
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 #GFSv17	settings
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index 1f5cbb086e..60e9de59ca 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -84,4 +84,4 @@ export FV3_RUN=cpld_control_run.IN
 
 if [[ $MACHINE_ID = derecho ]]; then
   TPN=96
-fi
\ No newline at end of file
+fi
diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
index e4ab5ccf82..6476e7540b 100644
--- a/tests/tests/cpld_debug_gfsv17
+++ b/tests/tests/cpld_debug_gfsv17
@@ -112,7 +112,7 @@ export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
 export DIAG_TABLE=diag_table_cpld.IN
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
index e3590bbf59..19076b671e 100644
--- a/tests/tests/cpld_mpi_gfsv17
+++ b/tests/tests/cpld_mpi_gfsv17
@@ -99,7 +99,7 @@ export CICE_BLCKY=`expr $NY_GLB / 2`
 export atm_omp_num_threads=$THRD_cpl_unstr
 export med_omp_num_threads=$atm_omp_num_threads
 
-# P8 UGWP1
+# UGWP1
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.
@@ -127,7 +127,7 @@ export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
 export DIAG_TABLE=diag_table_cpld.IN
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 #GFSv17	settings
diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
index 35192c28d6..62a97d4fb3 100644
--- a/tests/tests/cpld_restart_gfsv17
+++ b/tests/tests/cpld_restart_gfsv17
@@ -98,7 +98,7 @@ WAV_tasks=$WAV_tasks_cpl_unstr
 export atm_omp_num_threads=$THRD_cpl_unstr
 export med_omp_num_threads=$atm_omp_num_threads
 
-# P8 UGWP1
+# UGWP1
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.
@@ -127,7 +127,7 @@ export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma
 export DIAG_TABLE=diag_table_cpld.IN
-export INPUT_NML=cpld_control.nml.IN
+export INPUT_NML=global_control.nml.IN
 export UFS_CONFIGURE=ufs.configure.s2sw.IN
 
 #GFSv17	settings
diff --git a/tests/tests/gnv1_c96_no_nest_debug b/tests/tests/gnv1_c96_no_nest_debug
index 935079652e..3de6194b95 100644
--- a/tests/tests/gnv1_c96_no_nest_debug
+++ b/tests/tests/gnv1_c96_no_nest_debug
@@ -47,7 +47,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210322.070000.sfc_data.tile5.nc \
                    RESTART/20210322.070000.sfc_data.tile6.nc"
 
-export_fv3
+export_fv3_v16
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=300
diff --git a/tests/tests/merra2_thompson b/tests/tests/merra2_thompson
index 7e217c27ff..ef206dab97 100644
--- a/tests/tests/merra2_thompson
+++ b/tests/tests/merra2_thompson
@@ -54,6 +54,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20210323.060000.sfc_data.tile6.nc"
 
 export_fv3
+export_tiled
 export NPZ=127
 export NPZP=128
 export DT_ATMOS=600
@@ -67,7 +68,6 @@ export OUTPUT_GRID='gaussian_grid'
 export WRITE_DOPOST=.true.
 export OUTPUT_FH='0 21 24'
 
-# P7 default
 export IALB=2
 export IEMS=2
 export LSM=2
@@ -76,19 +76,16 @@ export IOPT_CRS=2
 export IOPT_RAD=3
 export IOPT_ALB=1
 export IOPT_STC=3
-# P8
 export IOPT_SFC=3
 export IOPT_TRS=2
 export IOPT_DIAG=2
 
-# FV3 P7 settings
 export D2_BG_K1=0.20
 export D2_BG_K2=0.04
 export PSM_BC=1
-# P8
 export DDDMP=0.1
 
-# P7 Merra2 Aerosols & NSST
+# Merra2 Aerosols & NSST
 export USE_MERRA2=.true.
 export LTAEROSOL=.false.
 export MRAEROSOL=.true.
@@ -98,7 +95,7 @@ export NSTF_NAME=2,1,0,0,0
 export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
-# P7 UGWP1
+# UGWP1
 export GWD_OPT=2
 export DO_UGWP_V1=.false.
 export KNOB_UGWP_VERSION=0
@@ -111,7 +108,7 @@ export DO_UGWP_V1_OROG_ONLY=.false.
 export DO_UGWP_V0_NST_ONLY=.false.
 export LDIAG_UGWP=.false.
 
-# P7 CA
+# CA
 export DO_CA=.true.
 export CA_SGS=.true.
 export CA_GLOBAL=.false.
@@ -125,25 +122,6 @@ export CA_TRIGGER=.true.
 export NSPINUP=1
 export ISEED_CA=12345
 
-# P7 settings
-export TILEDFIX=.true.
-export FNALBC="'C96.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C96.facsf.tileX.nc'"
-export FNTG3C="'C96.substrate_temperature.tileX.nc'"
-export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
-export FNVETC="'C96.vegetation_type.tileX.nc'"
-export FNSOTC="'C96.soil_type.tileX.nc'"
-export FNSOCC="'C96.soil_color.tileX.nc'"
-export FNSMCC=${FNSMCC_control}
-export FNMSKH=${FNMSKH_control}
-export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C96.slope_type.tileX.nc'"
-export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
-export LANDICE=".false."
-export FSICL=0
-export FSICS=0
-
 export IMP_PHYSICS=8
 export LGFDLMPRAD=.false.
 export DO_SAT_ADJ=.false.
@@ -154,7 +132,7 @@ export DZ_MIN=6
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
 export MOM6_RESTART_SETTING=n
-# P8 (not used for standalone)
+# Following not used for standalone
 export USE_CICE_ALB=.false.
 
 export WRITE_NSFLIP=.true.
@@ -163,8 +141,7 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_p8
 export FIELD_TABLE=field_table_mr2
 export DIAG_TABLE=diag_table_mr2
-# use same namelist for standalone,coupled P7
-export INPUT_NML=merra2_thompson.nml.IN
+export INPUT_NML=global_control.nml.IN
 
 # RRTMGP
 export DO_RRTMGP=.false.
diff --git a/tests/tests/regional_2dwrtdecomp b/tests/tests/regional_2dwrtdecomp
index 7900e76b7b..f76c1b97b0 100644
--- a/tests/tests/regional_2dwrtdecomp
+++ b/tests/tests/regional_2dwrtdecomp
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_2threads b/tests/tests/regional_2threads
index e705ab6747..9d3e3d5ce3 100644
--- a/tests/tests/regional_2threads
+++ b/tests/tests/regional_2threads
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_atmaq b/tests/tests/regional_atmaq
index 54fb6f1514..df4603f299 100644
--- a/tests/tests/regional_atmaq
+++ b/tests/tests/regional_atmaq
@@ -22,7 +22,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20190801.180000.phy_data.nc \
                    RESTART/20190801.180000.sfc_data.nc"
 
-export_fv3
+export_fv3_v16
 
 export SYEAR=2019
 export SMONTH=08
diff --git a/tests/tests/regional_atmaq_debug b/tests/tests/regional_atmaq_debug
index 17fcea688a..7cfe2f8489 100644
--- a/tests/tests/regional_atmaq_debug
+++ b/tests/tests/regional_atmaq_debug
@@ -20,7 +20,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20190801.130000.phy_data.nc \
                    RESTART/20190801.130000.sfc_data.nc"
 
-export_fv3
+export_fv3_v16
 
 export SYEAR=2019
 export SMONTH=08
diff --git a/tests/tests/regional_atmaq_faster b/tests/tests/regional_atmaq_faster
index 75f85debf7..6ccb25375a 100644
--- a/tests/tests/regional_atmaq_faster
+++ b/tests/tests/regional_atmaq_faster
@@ -22,7 +22,7 @@ export LIST_FILES="sfcf000.nc \
                    RESTART/20190801.180000.phy_data.nc \
                    RESTART/20190801.180000.sfc_data.nc"
 
-export_fv3
+export_fv3_v16
 
 export SYEAR=2019
 export SMONTH=08
diff --git a/tests/tests/regional_control b/tests/tests/regional_control
index 98d50028e7..01cca0e714 100644
--- a/tests/tests/regional_control
+++ b/tests/tests/regional_control
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_control_faster b/tests/tests/regional_control_faster
index 350c2aecf8..17d31fdc0e 100644
--- a/tests/tests/regional_control_faster
+++ b/tests/tests/regional_control_faster
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_debug b/tests/tests/regional_debug
index 64e5921f76..46ff346b68 100644
--- a/tests/tests/regional_debug
+++ b/tests/tests/regional_debug
@@ -13,7 +13,7 @@ export LIST_FILES="dynf000.nc \
                    phyf000.nc \
                    phyf001.nc"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_decomp b/tests/tests/regional_decomp
index 55566313b2..a3931e4f18 100644
--- a/tests/tests/regional_decomp
+++ b/tests/tests/regional_decomp
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_ifi_2threads b/tests/tests/regional_ifi_2threads
index 743707a55c..8e1db314cd 100644
--- a/tests/tests/regional_ifi_2threads
+++ b/tests/tests/regional_ifi_2threads
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_ifi_control b/tests/tests/regional_ifi_control
index 85ab5ae6a9..089d372a78 100644
--- a/tests/tests/regional_ifi_control
+++ b/tests/tests/regional_ifi_control
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_ifi_decomp b/tests/tests/regional_ifi_decomp
index 4513f4618c..815587548a 100644
--- a/tests/tests/regional_ifi_decomp
+++ b/tests/tests/regional_ifi_decomp
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_netcdf_parallel b/tests/tests/regional_netcdf_parallel
index 0f20b07d94..13065d2da8 100644
--- a/tests/tests/regional_netcdf_parallel
+++ b/tests/tests/regional_netcdf_parallel
@@ -13,7 +13,7 @@ export LIST_FILES="dynf000.nc \
                    phyf000.nc \
                    phyf006.nc"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_noquilt b/tests/tests/regional_noquilt
index a87447702b..2498db9d91 100644
--- a/tests/tests/regional_noquilt
+++ b/tests/tests/regional_noquilt
@@ -14,7 +14,7 @@ export LIST_FILES="  atmos_4xdaily.nc \
      RESTART/fv_core.res.tile1_new.nc \
    RESTART/fv_tracer.res.tile1_new.nc"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_restart b/tests/tests/regional_restart
index 6ce9242440..c09332019e 100644
--- a/tests/tests/regional_restart
+++ b/tests/tests/regional_restart
@@ -13,7 +13,7 @@ export LIST_FILES="dynf006.nc \
                    PRSLEV.GrbF06 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN
 
diff --git a/tests/tests/regional_rrfs_a b/tests/tests/regional_rrfs_a
index f1b6d09d93..4aace3f9e2 100644
--- a/tests/tests/regional_rrfs_a
+++ b/tests/tests/regional_rrfs_a
@@ -13,7 +13,7 @@ export LIST_FILES="dynf000.nc \
                    phyf000.nc \
                    phyf001.nc"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_rrfs_a_run.IN
 
diff --git a/tests/tests/regional_spp_sppt_shum_skeb b/tests/tests/regional_spp_sppt_shum_skeb
index 830886bc27..7b79586105 100644
--- a/tests/tests/regional_spp_sppt_shum_skeb
+++ b/tests/tests/regional_spp_sppt_shum_skeb
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF01"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run_stoch.IN
 
diff --git a/tests/tests/regional_spp_sppt_shum_skeb_dyn32_phy32 b/tests/tests/regional_spp_sppt_shum_skeb_dyn32_phy32
index 9431e9b26a..eeb01afe60 100644
--- a/tests/tests/regional_spp_sppt_shum_skeb_dyn32_phy32
+++ b/tests/tests/regional_spp_sppt_shum_skeb_dyn32_phy32
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF01"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run_stoch.IN
 
diff --git a/tests/tests/regional_wofs b/tests/tests/regional_wofs
index d1ee23a786..3b5a62bf8e 100644
--- a/tests/tests/regional_wofs
+++ b/tests/tests/regional_wofs
@@ -17,7 +17,7 @@ export LIST_FILES="dynf000.nc \
                    NATLEV.GrbF00 \
                    NATLEV.GrbF06"
 
-export_fv3
+export_fv3_v16
 
 export FV3_RUN=regional_run.IN