From 694e139a2cdc842407726b66df5775892f888018 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 17 Mar 2021 21:10:55 -0600
Subject: [PATCH 01/10] Final step to remove IPD (remove _ccpp labels from
 regression tests), RAS updates and regression tests (#448)

* Remove _ccpp labels from regression tests
* Replace rasmgshoc test with GFSv15p2+ras test, add debug test, add to rt.conf and rt_gnu.conf
* Rename regression tests in tests/rt_gnu.conf
* Replace v15p2+RAS regression tests with GFSv16+RAS tests
* Update regression test config files: change GFSv15p2+RAS to GFsv16+RAS
* Update regression test baseline date tag in tests/rt.sh
* Bugfixes in tests/tests/fv3_regional_quilt and tests/tests/fv3_regional_quilt_hafs
* Add REPRO=Y to compile line for multigases test
* Regression test logs for cheyenne, hera, gaea, jet
* Revert change to .gitmodules and update submodule pointer for fv3atm; run-ci
---
 FV3                                           |    2 +-
 tests/RegressionTests_cheyenne.gnu.log        |  574 +++++---
 tests/RegressionTests_cheyenne.intel.log      | 1184 +++++++++-------
 tests/RegressionTests_gaea.intel.log          | 1148 ++++++++-------
 tests/RegressionTests_hera.gnu.log            |  574 +++++---
 tests/RegressionTests_hera.intel.log          | 1248 +++++++++--------
 tests/RegressionTests_jet.intel.log           |  820 ++++++-----
 tests/default_vars.sh                         |    1 +
 ...v0_hwrf_run.IN => c96_HAFS_v0_hwrf_run.IN} |    0
 tests/fv3_conf/ccpp_cpt_run.IN                |   20 -
 tests/fv3_conf/ccpp_csawmg3shoc127_run.IN     |   20 -
 tests/fv3_conf/ccpp_csawmg_run.IN             |   50 -
 tests/fv3_conf/ccpp_csawmgshoc_run.IN         |   31 -
 tests/fv3_conf/ccpp_gfdlmp_run.IN             |   49 -
 tests/fv3_conf/ccpp_gfs_v15_run.IN            |   23 -
 tests/fv3_conf/ccpp_gfs_v16_run.IN            |   25 -
 tests/fv3_conf/ccpp_gfsv16_csawmg_run.IN      |   32 -
 tests/fv3_conf/ccpp_multigases_run.IN         |   32 -
 tests/fv3_conf/ccpp_regional_c786_run.IN      |   25 -
 tests/fv3_conf/ccpp_satmedmf_run.IN           |   46 -
 .../{ccpp_control_run.IN => control_run.IN}   |   24 +-
 tests/fv3_conf/cpt_run.IN                     |    1 +
 tests/fv3_conf/csawmg3shoc127_run.IN          |   23 +-
 tests/fv3_conf/csawmg_run.IN                  |    2 +
 tests/fv3_conf/csawmgshoc_run.IN              |   32 +-
 ...v0_hwrf_run.IN => esg_HAFS_v0_hwrf_run.IN} |    0
 ..._gf_thompson_run.IN => gf_thompson_run.IN} |    0
 tests/fv3_conf/gfdlmp_run.IN                  |   10 +-
 tests/fv3_conf/gfs_v15_run.IN                 |    4 +
 ..._v16_flake_run.IN => gfs_v16_flake_run.IN} |    0
 tests/fv3_conf/gfs_v16_run.IN                 |   18 +-
 ...un_c192L127.IN => gfs_v16_run_c192L127.IN} |    2 +-
 ...v16_ugwpv1_run.IN => gfsv16_ugwpv1_run.IN} |    0
 tests/fv3_conf/{ccpp_gocart.IN => gocart.IN}  |    0
 .../fv3_conf/{ccpp_gsd_run.IN => gsd_run.IN}  |    2 +-
 .../{ccpp_gsd_sar_run.IN => gsd_sar_run.IN}   |    0
 tests/fv3_conf/rasmgshoc_run.IN               |   20 -
 tests/fv3_conf/regional_c786_run.IN           |   25 +
 .../{ccpp_regional_run.IN => regional_run.IN} |   14 +-
 tests/fv3_conf/satmedmf_run.IN                |    4 +-
 ...ccpp_stretched_run.IN => stretched_run.IN} |    0
 ...v0_hwrf.nml.IN => c96_HAFS_v0_hwrf.nml.IN} |    0
 tests/parm/{ccpp_ca.nml.IN => ca.nml.IN}      |    0
 tests/parm/ccpp_cpt.nml.IN                    |  355 -----
 tests/parm/ccpp_csawmg.nml.IN                 |  305 ----
 tests/parm/ccpp_csawmg3shoc127.nml.IN         |  305 ----
 tests/parm/ccpp_csawmgshoc.nml.IN             |  304 ----
 tests/parm/ccpp_input_nest02.nml.IN           |  292 ----
 .../{ccpp_control.nml.IN => control.nml.IN}   |    0
 tests/parm/cpt.nml.IN                         |    3 +
 tests/parm/csawmg.nml.IN                      |    5 +-
 tests/parm/csawmg3shoc127.nml.IN              |    7 +-
 tests/parm/csawmgshoc.nml.IN                  |    5 +-
 ...IN => esg_HAFS_v0_hwrf-model_configure.IN} |    0
 ...v0_hwrf.nml.IN => esg_HAFS_v0_hwrf.nml.IN} |    0
 .../{ccpp_gfdlmp.nml.IN => gfdlmp.nml.IN}     |    0
 ...v16_csawmg.nml.IN => gfsv16_csawmg.nml.IN} |    0
 .../{ccpp.gocart.nml.IN => gocart.nml.IN}     |    0
 tests/parm/{ccpp_gsd.nml.IN => gsd.nml.IN}    |    0
 ...pp_gsd_rrtmgp.nml.IN => gsd_rrtmgp.nml.IN} |    0
 ...onfigure.IN => gsd_sar-model_configure.IN} |    0
 .../{ccpp_gsd_sar.nml.IN => gsd_sar.nml.IN}   |    0
 tests/parm/input_nest02.nml.IN                |    3 +-
 tests/parm/{ccpp_lndp.nml.IN => lndp.nml.IN}  |    0
 ..._multi_gases.nml.IN => multi_gases.nml.IN} |    0
 .../{ccpp_regional.nml.IN => regional.nml.IN} |    0
 ...ional_c768.nml.IN => regional_c768.nml.IN} |    0
 ...ed-input.nml.IN => stretched-input.nml.IN} |    0
 ...put.nml.IN => stretched-nest-input.nml.IN} |    0
 ...ccpp_v15p2_c96.nml.IN => v15p2_c96.nml.IN} |   11 +-
 ..._rrtmgp.nml.IN => v15p2_c96_rrtmgp.nml.IN} |    0
 ...tmgp.nml.IN => v16_c192L127_rrtmgp.nml.IN} |    0
 .../{ccpp_v16_c96.nml.IN => v16_c96.nml.IN}   |    7 +-
 ...96_rrtmgp.nml.IN => v16_c96_rrtmgp.nml.IN} |    0
 ...96_ugwpv1.nml.IN => v16_c96_ugwpv1.nml.IN} |    0
 ..._flake_c96.nml.IN => v16_flake_c96.nml.IN} |    0
 tests/rt.conf                                 |  254 ++--
 tests/rt.sh                                   |    8 +-
 tests/rt_gnu.conf                             |   78 +-
 .../tests/{fv3_ccpp_2threads => fv3_2threads} |    4 +-
 ...fv3_ccpp_HAFS_v0_hwrf => fv3_HAFS_v0_hwrf} |    4 +-
 ...S_v0_hwrf_debug => fv3_HAFS_v0_hwrf_debug} |    4 +-
 ...wrf_thompson => fv3_HAFS_v0_hwrf_thompson} |    4 +-
 ..._debug => fv3_HAFS_v0_hwrf_thompson_debug} |    4 +-
 .../tests/{fv3_ccpp_appbuild => fv3_appbuild} |    4 +-
 tests/tests/{fv3_ccpp_ca => fv3_ca}           |    4 +-
 tests/tests/{fv3_ccpp_control => fv3_control} |    4 +-
 ...3_ccpp_control_32bit => fv3_control_32bit} |    4 +-
 ...3_ccpp_control_debug => fv3_control_debug} |    4 +-
 tests/tests/{fv3_ccpp_cpt => fv3_cpt}         |    4 +-
 tests/tests/{fv3_ccpp_csawmg => fv3_csawmg}   |    4 +-
 ...ccpp_csawmg3shoc127 => fv3_csawmg3shoc127} |    4 +-
 .../{fv3_ccpp_csawmgshoc => fv3_csawmgshoc}   |    4 +-
 tests/tests/{fv3_ccpp_decomp => fv3_decomp}   |    4 +-
 ...thompson => fv3_esg_HAFS_v0_hwrf_thompson} |    6 +-
 ...ug => fv3_esg_HAFS_v0_hwrf_thompson_debug} |    6 +-
 tests/tests/{fv3_ccpp_gf => fv3_gf}           |    4 +-
 .../{fv3_ccpp_gf_thompson => fv3_gf_thompson} |    4 +-
 tests/tests/{fv3_ccpp_gfdlmp => fv3_gfdlmp}   |    4 +-
 ...fv3_ccpp_gfdlmp_32bit => fv3_gfdlmp_32bit} |    4 +-
 .../{fv3_ccpp_gfdlmprad => fv3_gfdlmprad}     |    4 +-
 ...ad_32bit_post => fv3_gfdlmprad_32bit_post} |    4 +-
 ..._gfdlmprad_atmwav => fv3_gfdlmprad_atmwav} |    4 +-
 ...3_ccpp_gfdlmprad_gwd => fv3_gfdlmprad_gwd} |    4 +-
 ..._gfdlmprad_noahmp => fv3_gfdlmprad_noahmp} |    4 +-
 tests/tests/{fv3_ccpp_gfs_myj => fv3_gfs_myj} |    4 +-
 .../{fv3_ccpp_gfs_v15p2 => fv3_gfs_v15p2}     |    4 +-
 ..._gfs_v15p2_RRTMGP => fv3_gfs_v15p2_RRTMGP} |    4 +-
 ...RTMGP_debug => fv3_gfs_v15p2_RRTMGP_debug} |    4 +-
 ...pp_gfs_v15p2_debug => fv3_gfs_v15p2_debug} |    4 +-
 tests/tests/{fv3_ccpp_gfs_v16 => fv3_gfs_v16} |    4 +-
 ...ccpp_gfs_v16_RRTMGP => fv3_gfs_v16_RRTMGP} |    4 +-
 ..._RRTMGP_2thrd => fv3_gfs_v16_RRTMGP_2thrd} |    4 +-
 ...P_c192L127 => fv3_gfs_v16_RRTMGP_c192L127} |    4 +-
 ..._RRTMGP_debug => fv3_gfs_v16_RRTMGP_debug} |    4 +-
 ...3_ccpp_gfs_v16_debug => fv3_gfs_v16_debug} |    4 +-
 ...3_ccpp_gfs_v16_flake => fv3_gfs_v16_flake} |    4 +-
 tests/tests/fv3_gfs_v16_ras                   |   87 ++
 tests/tests/fv3_gfs_v16_ras_debug             |   89 ++
 ...pp_gfs_v16_restart => fv3_gfs_v16_restart} |    4 +-
 ...ccpp_gfs_v16_stochy => fv3_gfs_v16_stochy} |    4 +-
 ...3_ccpp_gfsv16_csawmg => fv3_gfsv16_csawmg} |    4 +-
 ...ccpp_gfsv16_csawmgt => fv3_gfsv16_csawmgt} |    4 +-
 ...3_ccpp_gfsv16_ugwpv1 => fv3_gfsv16_ugwpv1} |   15 +-
 ...6_ugwpv1_debug => fv3_gfsv16_ugwpv1_debug} |   15 +-
 ..._warmstart => fv3_gfsv16_ugwpv1_warmstart} |   16 +-
 .../{fv3_ccpp_gocart_clm => fv3_gocart_clm}   |    4 +-
 tests/tests/{fv3_ccpp_gsd => fv3_gsd}         |    4 +-
 .../{fv3_ccpp_gsd_RRTMGP => fv3_gsd_RRTMGP}   |    4 +-
 ..._gsd_RRTMGP_debug => fv3_gsd_RRTMGP_debug} |    4 +-
 ...3_ccpp_gsd_coldstart => fv3_gsd_coldstart} |    4 +-
 .../{fv3_ccpp_gsd_debug => fv3_gsd_debug}     |    4 +-
 ..._gsd_diag3d_debug => fv3_gsd_diag3d_debug} |    4 +-
 ...ccpp_gsd_drag_suite => fv3_gsd_drag_suite} |    4 +-
 ...d_ugwp => fv3_gsd_drag_suite_unified_ugwp} |    4 +-
 .../tests/{fv3_ccpp_gsd_lndp => fv3_gsd_lndp} |    4 +-
 .../{fv3_ccpp_gsd_mynnsfc => fv3_gsd_mynnsfc} |    4 +-
 ...sd_mynnsfc_debug => fv3_gsd_mynnsfc_debug} |    4 +-
 .../tests/{fv3_ccpp_gsd_noah => fv3_gsd_noah} |    4 +-
 ...3_ccpp_gsd_noah_lndp => fv3_gsd_noah_lndp} |    4 +-
 ..._gsd_noah_mynnsfc => fv3_gsd_noah_mynnsfc} |    4 +-
 ...nnsfc_debug => fv3_gsd_noah_mynnsfc_debug} |    4 +-
 tests/tests/{fv3_ccpp_gsd_sar => fv3_gsd_sar} |    6 +-
 ...3_ccpp_gsd_sar_debug => fv3_gsd_sar_debug} |    6 +-
 ..._gsd_unified_ugwp => fv3_gsd_unified_ugwp} |    4 +-
 ...3_ccpp_gsd_warmstart => fv3_gsd_warmstart} |    4 +-
 tests/tests/{fv3_ccpp_h2ophys => fv3_h2ophys} |    4 +-
 tests/tests/{fv3_ccpp_hrrr => fv3_hrrr}       |    4 +-
 tests/tests/{fv3_ccpp_iau => fv3_iau}         |    4 +-
 .../{fv3_ccpp_lheatstrg => fv3_lheatstrg}     |    4 +-
 tests/tests/{fv3_ccpp_lndp => fv3_lndp}       |    4 +-
 .../{fv3_ccpp_multigases => fv3_multigases}   |    4 +-
 tests/tests/{fv3_ccpp_mynn => fv3_mynn}       |    4 +-
 .../tests/{fv3_ccpp_ntiedtke => fv3_ntiedtke} |    4 +-
 .../{fv3_ccpp_ozphys_2015 => fv3_ozphys_2015} |    4 +-
 tests/tests/{fv3_ccpp_rap => fv3_rap}         |    4 +-
 tests/tests/fv3_rasmgshoc                     |   66 -
 .../tests/{fv3_ccpp_read_inc => fv3_read_inc} |    4 +-
 ...3_ccpp_regional_c768 => fv3_regional_c768} |    6 +-
 ..._regional_control => fv3_regional_control} |    4 +-
 ...ntrol_debug => fv3_regional_control_debug} |    4 +-
 ...ccpp_regional_quilt => fv3_regional_quilt} |    4 +-
 ...nal_quilt_hafs => fv3_regional_quilt_hafs} |    4 +-
 ...lel => fv3_regional_quilt_netcdf_parallel} |    4 +-
 ..._regional_restart => fv3_regional_restart} |    4 +-
 tests/tests/{fv3_ccpp_restart => fv3_restart} |    4 +-
 .../{fv3_ccpp_rrfs_v1beta => fv3_rrfs_v1beta} |    4 +-
 ...rfs_v1beta_debug => fv3_rrfs_v1beta_debug} |    4 +-
 tests/tests/{fv3_ccpp_sas => fv3_sas}         |    4 +-
 .../tests/{fv3_ccpp_satmedmf => fv3_satmedmf} |    4 +-
 .../{fv3_ccpp_satmedmfq => fv3_satmedmfq}     |    4 +-
 .../tests/{fv3_ccpp_shinhong => fv3_shinhong} |    4 +-
 tests/tests/{fv3_ccpp_stochy => fv3_stochy}   |    4 +-
 .../{fv3_ccpp_stretched => fv3_stretched}     |    4 +-
 ...ccpp_stretched_nest => fv3_stretched_nest} |    6 +-
 ...ed_nest_debug => fv3_stretched_nest_debug} |    6 +-
 ...ed_nest_quilt => fv3_stretched_nest_quilt} |    6 +-
 .../tests/{fv3_ccpp_thompson => fv3_thompson} |    4 +-
 ...ccpp_thompson_debug => fv3_thompson_debug} |    4 +-
 ...3_ccpp_thompson_mynn => fv3_thompson_mynn} |    4 +-
 ..._thompson_no_aero => fv3_thompson_no_aero} |    4 +-
 ..._aero_debug => fv3_thompson_no_aero_debug} |    4 +-
 ...pp_wrtGauss_nemsio => fv3_wrtGauss_nemsio} |    4 +-
 ...s_nemsio_c192 => fv3_wrtGauss_nemsio_c192} |    4 +-
 ...s_nemsio_c768 => fv3_wrtGauss_nemsio_c768} |    4 +-
 ...pp_wrtGauss_netcdf => fv3_wrtGauss_netcdf} |    4 +-
 ...s_netcdf_esmf => fv3_wrtGauss_netcdf_esmf} |    4 +-
 ..._parallel => fv3_wrtGauss_netcdf_parallel} |    4 +-
 ...rtGlatlon_netcdf => fv3_wrtGlatlon_netcdf} |    4 +-
 tests/tests/{fv3_ccpp_ysu => fv3_ysu}         |    4 +-
 190 files changed, 3906 insertions(+), 4845 deletions(-)
 rename tests/fv3_conf/{ccpp_c96_HAFS_v0_hwrf_run.IN => c96_HAFS_v0_hwrf_run.IN} (100%)
 delete mode 100644 tests/fv3_conf/ccpp_cpt_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_csawmg3shoc127_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_csawmg_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_csawmgshoc_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_gfdlmp_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_gfs_v15_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_gfs_v16_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_gfsv16_csawmg_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_multigases_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_regional_c786_run.IN
 delete mode 100644 tests/fv3_conf/ccpp_satmedmf_run.IN
 rename tests/fv3_conf/{ccpp_control_run.IN => control_run.IN} (70%)
 rename tests/fv3_conf/{ccpp_esg_HAFS_v0_hwrf_run.IN => esg_HAFS_v0_hwrf_run.IN} (100%)
 rename tests/fv3_conf/{ccpp_gf_thompson_run.IN => gf_thompson_run.IN} (100%)
 rename tests/fv3_conf/{ccpp_gfs_v16_flake_run.IN => gfs_v16_flake_run.IN} (100%)
 rename tests/fv3_conf/{ccpp_gfs_v16_run_c192L127.IN => gfs_v16_run_c192L127.IN} (93%)
 rename tests/fv3_conf/{ccpp_gfsv16_ugwpv1_run.IN => gfsv16_ugwpv1_run.IN} (100%)
 rename tests/fv3_conf/{ccpp_gocart.IN => gocart.IN} (100%)
 rename tests/fv3_conf/{ccpp_gsd_run.IN => gsd_run.IN} (98%)
 rename tests/fv3_conf/{ccpp_gsd_sar_run.IN => gsd_sar_run.IN} (100%)
 delete mode 100644 tests/fv3_conf/rasmgshoc_run.IN
 create mode 100644 tests/fv3_conf/regional_c786_run.IN
 rename tests/fv3_conf/{ccpp_regional_run.IN => regional_run.IN} (65%)
 rename tests/fv3_conf/{ccpp_stretched_run.IN => stretched_run.IN} (100%)
 rename tests/parm/{ccpp_c96_HAFS_v0_hwrf.nml.IN => c96_HAFS_v0_hwrf.nml.IN} (100%)
 rename tests/parm/{ccpp_ca.nml.IN => ca.nml.IN} (100%)
 delete mode 100644 tests/parm/ccpp_cpt.nml.IN
 delete mode 100644 tests/parm/ccpp_csawmg.nml.IN
 delete mode 100644 tests/parm/ccpp_csawmg3shoc127.nml.IN
 delete mode 100644 tests/parm/ccpp_csawmgshoc.nml.IN
 delete mode 100644 tests/parm/ccpp_input_nest02.nml.IN
 rename tests/parm/{ccpp_control.nml.IN => control.nml.IN} (100%)
 rename tests/parm/{ccpp_esg_HAFS_v0_hwrf-model_configure.IN => esg_HAFS_v0_hwrf-model_configure.IN} (100%)
 rename tests/parm/{ccpp_esg_HAFS_v0_hwrf.nml.IN => esg_HAFS_v0_hwrf.nml.IN} (100%)
 rename tests/parm/{ccpp_gfdlmp.nml.IN => gfdlmp.nml.IN} (100%)
 rename tests/parm/{ccpp_gfsv16_csawmg.nml.IN => gfsv16_csawmg.nml.IN} (100%)
 rename tests/parm/{ccpp.gocart.nml.IN => gocart.nml.IN} (100%)
 rename tests/parm/{ccpp_gsd.nml.IN => gsd.nml.IN} (100%)
 rename tests/parm/{ccpp_gsd_rrtmgp.nml.IN => gsd_rrtmgp.nml.IN} (100%)
 rename tests/parm/{ccpp_gsd_sar-model_configure.IN => gsd_sar-model_configure.IN} (100%)
 rename tests/parm/{ccpp_gsd_sar.nml.IN => gsd_sar.nml.IN} (100%)
 rename tests/parm/{ccpp_lndp.nml.IN => lndp.nml.IN} (100%)
 rename tests/parm/{ccpp_multi_gases.nml.IN => multi_gases.nml.IN} (100%)
 rename tests/parm/{ccpp_regional.nml.IN => regional.nml.IN} (100%)
 rename tests/parm/{ccpp_regional_c768.nml.IN => regional_c768.nml.IN} (100%)
 rename tests/parm/{ccpp_stretched-input.nml.IN => stretched-input.nml.IN} (100%)
 rename tests/parm/{ccpp_stretched-nest-input.nml.IN => stretched-nest-input.nml.IN} (100%)
 rename tests/parm/{ccpp_v15p2_c96.nml.IN => v15p2_c96.nml.IN} (97%)
 rename tests/parm/{ccpp_v15p2_c96_rrtmgp.nml.IN => v15p2_c96_rrtmgp.nml.IN} (100%)
 rename tests/parm/{ccpp_v16_c192L127_rrtmgp.nml.IN => v16_c192L127_rrtmgp.nml.IN} (100%)
 rename tests/parm/{ccpp_v16_c96.nml.IN => v16_c96.nml.IN} (98%)
 rename tests/parm/{ccpp_v16_c96_rrtmgp.nml.IN => v16_c96_rrtmgp.nml.IN} (100%)
 rename tests/parm/{ccpp_v16_c96_ugwpv1.nml.IN => v16_c96_ugwpv1.nml.IN} (100%)
 rename tests/parm/{ccpp_v16_flake_c96.nml.IN => v16_flake_c96.nml.IN} (100%)
 rename tests/tests/{fv3_ccpp_2threads => fv3_2threads} (97%)
 rename tests/tests/{fv3_ccpp_HAFS_v0_hwrf => fv3_HAFS_v0_hwrf} (97%)
 rename tests/tests/{fv3_ccpp_HAFS_v0_hwrf_debug => fv3_HAFS_v0_hwrf_debug} (97%)
 rename tests/tests/{fv3_ccpp_HAFS_v0_hwrf_thompson => fv3_HAFS_v0_hwrf_thompson} (97%)
 rename tests/tests/{fv3_ccpp_HAFS_v0_hwrf_thompson_debug => fv3_HAFS_v0_hwrf_thompson_debug} (97%)
 rename tests/tests/{fv3_ccpp_appbuild => fv3_appbuild} (97%)
 rename tests/tests/{fv3_ccpp_ca => fv3_ca} (97%)
 rename tests/tests/{fv3_ccpp_control => fv3_control} (97%)
 rename tests/tests/{fv3_ccpp_control_32bit => fv3_control_32bit} (97%)
 rename tests/tests/{fv3_ccpp_control_debug => fv3_control_debug} (94%)
 rename tests/tests/{fv3_ccpp_cpt => fv3_cpt} (97%)
 rename tests/tests/{fv3_ccpp_csawmg => fv3_csawmg} (97%)
 rename tests/tests/{fv3_ccpp_csawmg3shoc127 => fv3_csawmg3shoc127} (96%)
 rename tests/tests/{fv3_ccpp_csawmgshoc => fv3_csawmgshoc} (96%)
 rename tests/tests/{fv3_ccpp_decomp => fv3_decomp} (97%)
 rename tests/tests/{fv3_ccpp_esg_HAFS_v0_hwrf_thompson => fv3_esg_HAFS_v0_hwrf_thompson} (90%)
 rename tests/tests/{fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug => fv3_esg_HAFS_v0_hwrf_thompson_debug} (90%)
 rename tests/tests/{fv3_ccpp_gf => fv3_gf} (98%)
 rename tests/tests/{fv3_ccpp_gf_thompson => fv3_gf_thompson} (98%)
 rename tests/tests/{fv3_ccpp_gfdlmp => fv3_gfdlmp} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmp_32bit => fv3_gfdlmp_32bit} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmprad => fv3_gfdlmprad} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmprad_32bit_post => fv3_gfdlmprad_32bit_post} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmprad_atmwav => fv3_gfdlmprad_atmwav} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmprad_gwd => fv3_gfdlmprad_gwd} (97%)
 rename tests/tests/{fv3_ccpp_gfdlmprad_noahmp => fv3_gfdlmprad_noahmp} (97%)
 rename tests/tests/{fv3_ccpp_gfs_myj => fv3_gfs_myj} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v15p2 => fv3_gfs_v15p2} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v15p2_RRTMGP => fv3_gfs_v15p2_RRTMGP} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v15p2_RRTMGP_debug => fv3_gfs_v15p2_RRTMGP_debug} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v15p2_debug => fv3_gfs_v15p2_debug} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16 => fv3_gfs_v16} (98%)
 rename tests/tests/{fv3_ccpp_gfs_v16_RRTMGP => fv3_gfs_v16_RRTMGP} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_RRTMGP_2thrd => fv3_gfs_v16_RRTMGP_2thrd} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_RRTMGP_c192L127 => fv3_gfs_v16_RRTMGP_c192L127} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_RRTMGP_debug => fv3_gfs_v16_RRTMGP_debug} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_debug => fv3_gfs_v16_debug} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_flake => fv3_gfs_v16_flake} (97%)
 create mode 100644 tests/tests/fv3_gfs_v16_ras
 create mode 100644 tests/tests/fv3_gfs_v16_ras_debug
 rename tests/tests/{fv3_ccpp_gfs_v16_restart => fv3_gfs_v16_restart} (97%)
 rename tests/tests/{fv3_ccpp_gfs_v16_stochy => fv3_gfs_v16_stochy} (97%)
 rename tests/tests/{fv3_ccpp_gfsv16_csawmg => fv3_gfsv16_csawmg} (96%)
 rename tests/tests/{fv3_ccpp_gfsv16_csawmgt => fv3_gfsv16_csawmgt} (96%)
 rename tests/tests/{fv3_ccpp_gfsv16_ugwpv1 => fv3_gfsv16_ugwpv1} (85%)
 rename tests/tests/{fv3_ccpp_gfsv16_ugwpv1_debug => fv3_gfsv16_ugwpv1_debug} (84%)
 rename tests/tests/{fv3_ccpp_gfsv16_ugwpv1_warmstart => fv3_gfsv16_ugwpv1_warmstart} (84%)
 rename tests/tests/{fv3_ccpp_gocart_clm => fv3_gocart_clm} (97%)
 rename tests/tests/{fv3_ccpp_gsd => fv3_gsd} (98%)
 rename tests/tests/{fv3_ccpp_gsd_RRTMGP => fv3_gsd_RRTMGP} (98%)
 rename tests/tests/{fv3_ccpp_gsd_RRTMGP_debug => fv3_gsd_RRTMGP_debug} (97%)
 rename tests/tests/{fv3_ccpp_gsd_coldstart => fv3_gsd_coldstart} (96%)
 rename tests/tests/{fv3_ccpp_gsd_debug => fv3_gsd_debug} (98%)
 rename tests/tests/{fv3_ccpp_gsd_diag3d_debug => fv3_gsd_diag3d_debug} (98%)
 rename tests/tests/{fv3_ccpp_gsd_drag_suite => fv3_gsd_drag_suite} (98%)
 rename tests/tests/{fv3_ccpp_gsd_drag_suite_unified_ugwp => fv3_gsd_drag_suite_unified_ugwp} (98%)
 rename tests/tests/{fv3_ccpp_gsd_lndp => fv3_gsd_lndp} (98%)
 rename tests/tests/{fv3_ccpp_gsd_mynnsfc => fv3_gsd_mynnsfc} (98%)
 rename tests/tests/{fv3_ccpp_gsd_mynnsfc_debug => fv3_gsd_mynnsfc_debug} (98%)
 rename tests/tests/{fv3_ccpp_gsd_noah => fv3_gsd_noah} (98%)
 rename tests/tests/{fv3_ccpp_gsd_noah_lndp => fv3_gsd_noah_lndp} (98%)
 rename tests/tests/{fv3_ccpp_gsd_noah_mynnsfc => fv3_gsd_noah_mynnsfc} (98%)
 rename tests/tests/{fv3_ccpp_gsd_noah_mynnsfc_debug => fv3_gsd_noah_mynnsfc_debug} (98%)
 rename tests/tests/{fv3_ccpp_gsd_sar => fv3_gsd_sar} (87%)
 rename tests/tests/{fv3_ccpp_gsd_sar_debug => fv3_gsd_sar_debug} (88%)
 rename tests/tests/{fv3_ccpp_gsd_unified_ugwp => fv3_gsd_unified_ugwp} (98%)
 rename tests/tests/{fv3_ccpp_gsd_warmstart => fv3_gsd_warmstart} (98%)
 rename tests/tests/{fv3_ccpp_h2ophys => fv3_h2ophys} (97%)
 rename tests/tests/{fv3_ccpp_hrrr => fv3_hrrr} (98%)
 rename tests/tests/{fv3_ccpp_iau => fv3_iau} (97%)
 rename tests/tests/{fv3_ccpp_lheatstrg => fv3_lheatstrg} (97%)
 rename tests/tests/{fv3_ccpp_lndp => fv3_lndp} (97%)
 rename tests/tests/{fv3_ccpp_multigases => fv3_multigases} (97%)
 rename tests/tests/{fv3_ccpp_mynn => fv3_mynn} (98%)
 rename tests/tests/{fv3_ccpp_ntiedtke => fv3_ntiedtke} (97%)
 rename tests/tests/{fv3_ccpp_ozphys_2015 => fv3_ozphys_2015} (97%)
 rename tests/tests/{fv3_ccpp_rap => fv3_rap} (98%)
 delete mode 100644 tests/tests/fv3_rasmgshoc
 rename tests/tests/{fv3_ccpp_read_inc => fv3_read_inc} (97%)
 rename tests/tests/{fv3_ccpp_regional_c768 => fv3_regional_c768} (86%)
 rename tests/tests/{fv3_ccpp_regional_control => fv3_regional_control} (92%)
 rename tests/tests/{fv3_ccpp_regional_control_debug => fv3_regional_control_debug} (92%)
 rename tests/tests/{fv3_ccpp_regional_quilt => fv3_regional_quilt} (92%)
 rename tests/tests/{fv3_ccpp_regional_quilt_hafs => fv3_regional_quilt_hafs} (91%)
 rename tests/tests/{fv3_ccpp_regional_quilt_netcdf_parallel => fv3_regional_quilt_netcdf_parallel} (92%)
 rename tests/tests/{fv3_ccpp_regional_restart => fv3_regional_restart} (93%)
 rename tests/tests/{fv3_ccpp_restart => fv3_restart} (97%)
 rename tests/tests/{fv3_ccpp_rrfs_v1beta => fv3_rrfs_v1beta} (98%)
 rename tests/tests/{fv3_ccpp_rrfs_v1beta_debug => fv3_rrfs_v1beta_debug} (98%)
 rename tests/tests/{fv3_ccpp_sas => fv3_sas} (97%)
 rename tests/tests/{fv3_ccpp_satmedmf => fv3_satmedmf} (97%)
 rename tests/tests/{fv3_ccpp_satmedmfq => fv3_satmedmfq} (97%)
 rename tests/tests/{fv3_ccpp_shinhong => fv3_shinhong} (97%)
 rename tests/tests/{fv3_ccpp_stochy => fv3_stochy} (97%)
 rename tests/tests/{fv3_ccpp_stretched => fv3_stretched} (97%)
 rename tests/tests/{fv3_ccpp_stretched_nest => fv3_stretched_nest} (96%)
 rename tests/tests/{fv3_ccpp_stretched_nest_debug => fv3_stretched_nest_debug} (91%)
 rename tests/tests/{fv3_ccpp_stretched_nest_quilt => fv3_stretched_nest_quilt} (96%)
 rename tests/tests/{fv3_ccpp_thompson => fv3_thompson} (98%)
 rename tests/tests/{fv3_ccpp_thompson_debug => fv3_thompson_debug} (98%)
 rename tests/tests/{fv3_ccpp_thompson_mynn => fv3_thompson_mynn} (98%)
 rename tests/tests/{fv3_ccpp_thompson_no_aero => fv3_thompson_no_aero} (98%)
 rename tests/tests/{fv3_ccpp_thompson_no_aero_debug => fv3_thompson_no_aero_debug} (98%)
 rename tests/tests/{fv3_ccpp_wrtGauss_nemsio => fv3_wrtGauss_nemsio} (97%)
 rename tests/tests/{fv3_ccpp_wrtGauss_nemsio_c192 => fv3_wrtGauss_nemsio_c192} (97%)
 rename tests/tests/{fv3_ccpp_wrtGauss_nemsio_c768 => fv3_wrtGauss_nemsio_c768} (98%)
 rename tests/tests/{fv3_ccpp_wrtGauss_netcdf => fv3_wrtGauss_netcdf} (97%)
 rename tests/tests/{fv3_ccpp_wrtGauss_netcdf_esmf => fv3_wrtGauss_netcdf_esmf} (97%)
 rename tests/tests/{fv3_ccpp_wrtGauss_netcdf_parallel => fv3_wrtGauss_netcdf_parallel} (97%)
 rename tests/tests/{fv3_ccpp_wrtGlatlon_netcdf => fv3_wrtGlatlon_netcdf} (97%)
 rename tests/tests/{fv3_ccpp_ysu => fv3_ysu} (97%)

diff --git a/FV3 b/FV3
index 579abd47bb..dbaff1cbfb 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 579abd47bbdff6d33befae5e473d309a764b0da3
+Subproject commit dbaff1cbfb2764f2ffa605d20d3c1a99c44b01fe
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
index 0a298255a2..fb18913ac9 100644
--- a/tests/RegressionTests_cheyenne.gnu.log
+++ b/tests/RegressionTests_cheyenne.gnu.log
@@ -1,10 +1,10 @@
-Mon Mar 15 14:51:27 MDT 2021
+Wed Mar 17 15:01:40 MDT 2021
 Start Regression test
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfdlmp_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfdlmp_prod
-Checking test 001 fv3_ccpp_gfdlmp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfdlmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfdlmp
+Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -48,14 +48,14 @@ Checking test 001 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 74.402651
+The total amount of wall time                        = 73.616751
 
-Test 001 fv3_ccpp_gfdlmp PASS
+Test 001 fv3_gfdlmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v15p2_prod
-Checking test 002 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2
+Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -119,14 +119,14 @@ Checking test 002 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 132.929431
+The total amount of wall time                        = 137.489110
 
-Test 002 fv3_ccpp_gfs_v15p2 PASS
+Test 002 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_prod
-Checking test 003 fv3_ccpp_gfs_v16 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16
+Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -202,14 +202,14 @@ Checking test 003 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.078405
+The total amount of wall time                        = 188.023624
 
-Test 003 fv3_ccpp_gfs_v16 PASS
+Test 003 fv3_gfs_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_restart_prod
-Checking test 004 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_restart
+Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -255,14 +255,14 @@ Checking test 004 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 98.924708
+The total amount of wall time                        = 96.352609
 
-Test 004 fv3_ccpp_gfs_v16_restart PASS
+Test 004 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_stochy_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 005 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_stochy
+Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -326,14 +326,14 @@ Checking test 005 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 89.298163
+The total amount of wall time                        = 87.995187
 
-Test 005 fv3_ccpp_gfs_v16_stochy PASS
+Test 005 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_flake_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_flake_prod
-Checking test 006 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_flake
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_flake
+Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -397,14 +397,14 @@ Checking test 006 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 143.825747
+The total amount of wall time                        = 143.045845
 
-Test 006 fv3_ccpp_gfs_v16_flake PASS
+Test 006 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_RRTMGP
+Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -468,14 +468,14 @@ Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 251.902834
+The total amount of wall time                        = 251.776369
 
-Test 007 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 008 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_RRTMGP
+Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -539,14 +539,14 @@ Checking test 008 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 257.274978
+The total amount of wall time                        = 256.904365
 
-Test 008 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gsd_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gsd_prod
-Checking test 009 fv3_ccpp_gsd results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gsd
+Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -634,14 +634,14 @@ Checking test 009 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 357.526628
+The total amount of wall time                        = 352.093742
 
-Test 009 fv3_ccpp_gsd PASS
+Test 009 fv3_gsd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_thompson_prod
-Checking test 010 fv3_ccpp_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson
+Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -705,14 +705,14 @@ Checking test 010 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 167.791037
+The total amount of wall time                        = 166.850767
 
-Test 010 fv3_ccpp_thompson PASS
+Test 010 fv3_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_no_aero_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_thompson_no_aero_prod
-Checking test 011 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_no_aero
+Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -776,14 +776,14 @@ Checking test 011 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 159.248824
+The total amount of wall time                        = 157.963503
 
-Test 011 fv3_ccpp_thompson_no_aero PASS
+Test 011 fv3_thompson_no_aero PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_rrfs_v1beta_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_rrfs_v1beta_prod
-Checking test 012 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_rrfs_v1beta
+Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -847,14 +847,14 @@ Checking test 012 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 182.146076
+The total amount of wall time                        = 181.093884
 
-Test 012 fv3_ccpp_rrfs_v1beta PASS
+Test 012 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_HAFS_v0_hwrf_thompson
+Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -918,14 +918,14 @@ Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 244.563424
+The total amount of wall time                        = 258.319014
 
-Test 013 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -939,14 +939,14 @@ Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 444.904050
+The total amount of wall time                        = 446.279773
 
-Test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 015 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1
+Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1004,14 +1004,14 @@ Checking test 015 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 301.645268
+The total amount of wall time                        = 299.376887
 
-Test 015 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1_warmstart
+Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1069,14 +1069,85 @@ Checking test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 305.020664
+The total amount of wall time                        = 303.457903
 
-Test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_control_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_control_debug_prod
-Checking test 017 fv3_ccpp_control_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_ras
+Checking test 017 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 167.499220
+
+Test 017 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_control_debug
+Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1102,14 +1173,28 @@ Checking test 017 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 77.388080
+The total amount of wall time                        = 76.607637
+
+Test 018 fv3_control_debug PASS
+
+
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_regional_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_regional_control_debug
+Checking test 019 fv3_regional_control_debug results ....
+ Comparing atmos_4xdaily.nc .........OK
+ Comparing fv3_history2d.nc .........OK
+ Comparing fv3_history.nc .........OK
+ Comparing RESTART/fv_core.res.tile1_new.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
+
+The total amount of wall time                        = 188.760185
 
-Test 017 fv3_ccpp_control_debug PASS
+Test 019 fv3_regional_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_rrfs_v1beta_debug
+Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1122,24 +1207,24 @@ Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf006.tile1.nc .........OK
- Comparing phyf006.tile2.nc .........OK
- Comparing phyf006.tile3.nc .........OK
- Comparing phyf006.tile4.nc .........OK
- Comparing phyf006.tile5.nc .........OK
- Comparing phyf006.tile6.nc .........OK
+ Comparing phyf003.tile1.nc .........OK
+ Comparing phyf003.tile2.nc .........OK
+ Comparing phyf003.tile3.nc .........OK
+ Comparing phyf003.tile4.nc .........OK
+ Comparing phyf003.tile5.nc .........OK
+ Comparing phyf003.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf006.tile1.nc .........OK
- Comparing dynf006.tile2.nc .........OK
- Comparing dynf006.tile3.nc .........OK
- Comparing dynf006.tile4.nc .........OK
- Comparing dynf006.tile5.nc .........OK
- Comparing dynf006.tile6.nc .........OK
+ Comparing dynf003.tile1.nc .........OK
+ Comparing dynf003.tile2.nc .........OK
+ Comparing dynf003.tile3.nc .........OK
+ Comparing dynf003.tile4.nc .........OK
+ Comparing dynf003.tile5.nc .........OK
+ Comparing dynf003.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1173,14 +1258,14 @@ Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 134.497309
+The total amount of wall time                        = 110.901097
 
-Test 018 fv3_ccpp_gfs_v15p2_debug PASS
+Test 020 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_debug_prod
-Checking test 019 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gsd_debug
+Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1193,24 +1278,24 @@ Checking test 019 fv3_ccpp_gfs_v16_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf006.tile1.nc .........OK
- Comparing phyf006.tile2.nc .........OK
- Comparing phyf006.tile3.nc .........OK
- Comparing phyf006.tile4.nc .........OK
- Comparing phyf006.tile5.nc .........OK
- Comparing phyf006.tile6.nc .........OK
+ Comparing phyf003.tile1.nc .........OK
+ Comparing phyf003.tile2.nc .........OK
+ Comparing phyf003.tile3.nc .........OK
+ Comparing phyf003.tile4.nc .........OK
+ Comparing phyf003.tile5.nc .........OK
+ Comparing phyf003.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf006.tile1.nc .........OK
- Comparing dynf006.tile2.nc .........OK
- Comparing dynf006.tile3.nc .........OK
- Comparing dynf006.tile4.nc .........OK
- Comparing dynf006.tile5.nc .........OK
- Comparing dynf006.tile6.nc .........OK
+ Comparing dynf003.tile1.nc .........OK
+ Comparing dynf003.tile2.nc .........OK
+ Comparing dynf003.tile3.nc .........OK
+ Comparing dynf003.tile4.nc .........OK
+ Comparing dynf003.tile5.nc .........OK
+ Comparing dynf003.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1244,14 +1329,14 @@ Checking test 019 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 98.065764
+The total amount of wall time                        = 116.633345
 
-Test 019 fv3_ccpp_gfs_v16_debug PASS
+Test 021 fv3_gsd_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_debug
+Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1315,14 +1400,14 @@ Checking test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 193.482167
+The total amount of wall time                        = 185.570727
 
-Test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 022 fv3_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 021 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_no_aero_debug
+Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1386,14 +1471,14 @@ Checking test 021 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 195.041792
+The total amount of wall time                        = 179.866162
 
-Test 021 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 023 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_multigases_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_multigases_prod
-Checking test 022 fv3_ccpp_multigases results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_debug
+Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1456,35 +1541,15 @@ Checking test 022 fv3_ccpp_multigases results ....
  Comparing RESTART/sfc_data.tile4.nc .........OK
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 177.886693
+The total amount of wall time                        = 134.004125
 
-Test 022 fv3_ccpp_multigases PASS
+Test 024 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_regional_control_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_regional_control_debug_prod
-Checking test 023 fv3_ccpp_regional_control_debug results ....
- Comparing atmos_4xdaily.nc .........OK
- Comparing fv3_history2d.nc .........OK
- Comparing fv3_history.nc .........OK
- Comparing RESTART/fv_core.res.tile1_new.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
-
-The total amount of wall time                        = 188.380657
-
-Test 023 fv3_ccpp_regional_control_debug PASS
-
-
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_debug
+Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1497,24 +1562,24 @@ Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf003.tile1.nc .........OK
- Comparing phyf003.tile2.nc .........OK
- Comparing phyf003.tile3.nc .........OK
- Comparing phyf003.tile4.nc .........OK
- Comparing phyf003.tile5.nc .........OK
- Comparing phyf003.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf003.tile1.nc .........OK
- Comparing dynf003.tile2.nc .........OK
- Comparing dynf003.tile3.nc .........OK
- Comparing dynf003.tile4.nc .........OK
- Comparing dynf003.tile5.nc .........OK
- Comparing dynf003.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1548,14 +1613,14 @@ Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 113.011953
+The total amount of wall time                        = 97.658277
 
-Test 024 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 025 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gsd_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gsd_debug_prod
-Checking test 025 fv3_ccpp_gsd_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1568,24 +1633,24 @@ Checking test 025 fv3_ccpp_gsd_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf003.tile1.nc .........OK
- Comparing phyf003.tile2.nc .........OK
- Comparing phyf003.tile3.nc .........OK
- Comparing phyf003.tile4.nc .........OK
- Comparing phyf003.tile5.nc .........OK
- Comparing phyf003.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf003.tile1.nc .........OK
- Comparing dynf003.tile2.nc .........OK
- Comparing dynf003.tile3.nc .........OK
- Comparing dynf003.tile4.nc .........OK
- Comparing dynf003.tile5.nc .........OK
- Comparing dynf003.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1619,14 +1684,14 @@ Checking test 025 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.064604
+The total amount of wall time                        = 196.654978
 
-Test 025 fv3_ccpp_gsd_debug PASS
+Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_thompson_debug_prod
-Checking test 026 fv3_ccpp_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_RRTMGP_debug
+Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1690,14 +1755,14 @@ Checking test 026 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.973158
+The total amount of wall time                        = 199.520481
 
-Test 026 fv3_ccpp_thompson_debug PASS
+Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_no_aero_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 027 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_multigases
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_multigases
+Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1760,15 +1825,21 @@ Checking test 027 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile4.nc .........OK
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 183.491656
+The total amount of wall time                        = 176.551824
 
-Test 027 fv3_ccpp_thompson_no_aero_debug PASS
+Test 028 fv3_multigases PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1832,14 +1903,14 @@ Checking test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 113.668444
+The total amount of wall time                        = 113.111862
 
-Test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -1853,14 +1924,14 @@ Checking test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 214.472761
+The total amount of wall time                        = 215.358006
 
-Test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_33218/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 030 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1_debug
+Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1918,11 +1989,82 @@ Checking test 030 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 301.664569
+The total amount of wall time                        = 308.982518
+
+Test 031 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_ras_debug
+Checking test 032 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 172.077223
 
-Test 030 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 15:08:50 MDT 2021
-Elapsed time: 00h:17m:23s. Have a nice day!
+Wed Mar 17 15:22:05 MDT 2021
+Elapsed time: 00h:20m:25s. Have a nice day!
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
index b6fe967144..889cd4d3ee 100644
--- a/tests/RegressionTests_cheyenne.intel.log
+++ b/tests/RegressionTests_cheyenne.intel.log
@@ -1,10 +1,10 @@
-Mon Mar 15 15:13:41 MDT 2021
+Wed Mar 17 15:00:15 MDT 2021
 Start Regression test
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +68,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.445367
+The total amount of wall time                        = 47.977801
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_decomp_prod
-Checking test 002 fv3_ccpp_decomp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_decomp
+Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +139,14 @@ Checking test 002 fv3_ccpp_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.992650
+The total amount of wall time                        = 48.404157
 
-Test 002 fv3_ccpp_decomp PASS
+Test 002 fv3_decomp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_2threads_prod
-Checking test 003 fv3_ccpp_2threads results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_2threads
+Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -210,14 +210,14 @@ Checking test 003 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.487710
+The total amount of wall time                        = 107.164876
 
-Test 003 fv3_ccpp_2threads PASS
+Test 003 fv3_2threads PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_restart_prod
-Checking test 004 fv3_ccpp_restart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_restart
+Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -263,14 +263,14 @@ Checking test 004 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 23.733939
+The total amount of wall time                        = 22.442370
 
-Test 004 fv3_ccpp_restart PASS
+Test 004 fv3_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_read_inc_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_read_inc_prod
-Checking test 005 fv3_ccpp_read_inc results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_read_inc
+Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -334,14 +334,14 @@ Checking test 005 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.127170
+The total amount of wall time                        = 47.585103
 
-Test 005 fv3_ccpp_read_inc PASS
+Test 005 fv3_read_inc PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf_esmf
+Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -385,14 +385,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 129.408014
+The total amount of wall time                        = 123.916570
 
-Test 006 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf
+Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -436,14 +436,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.972747
+The total amount of wall time                        = 45.465214
 
-Test 007 fv3_ccpp_wrtGauss_netcdf PASS
+Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf_parallel
+Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -452,8 +452,8 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile6.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
- Comparing dynf000.nc ............ALT CHECK......OK
- Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing dynf000.nc .........OK
+ Comparing dynf024.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -487,14 +487,14 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.382240
+The total amount of wall time                        = 47.184444
 
-Test 008 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGlatlon_netcdf
+Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -538,14 +538,14 @@ Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.881769
+The total amount of wall time                        = 46.662453
 
-Test 009 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_nemsio
+Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -589,14 +589,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.590770
+The total amount of wall time                        = 46.507193
 
-Test 010 fv3_ccpp_wrtGauss_nemsio PASS
+Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_nemsio_c192
+Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +640,14 @@ Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.939269
+The total amount of wall time                        = 122.393899
 
-Test 011 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stochy_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_stochy_prod
-Checking test 012 fv3_ccpp_stochy results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stochy
+Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +711,14 @@ Checking test 012 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.687053
+The total amount of wall time                        = 55.603605
 
-Test 012 fv3_ccpp_stochy PASS
+Test 012 fv3_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ca_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_ca_prod
-Checking test 013 fv3_ccpp_ca results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_ca
+Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +782,14 @@ Checking test 013 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 29.662515
+The total amount of wall time                        = 29.020025
 
-Test 013 fv3_ccpp_ca PASS
+Test 013 fv3_ca PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lndp_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_lndp_prod
-Checking test 014 fv3_ccpp_lndp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_lndp
+Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +853,14 @@ Checking test 014 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.200055
+The total amount of wall time                        = 50.850419
 
-Test 014 fv3_ccpp_lndp PASS
+Test 014 fv3_lndp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_iau_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_iau_prod
-Checking test 015 fv3_ccpp_iau results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_iau
+Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -924,14 +924,14 @@ Checking test 015 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.913407
+The total amount of wall time                        = 46.657869
 
-Test 015 fv3_ccpp_iau PASS
+Test 015 fv3_iau PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lheatstrg_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_lheatstrg_prod
-Checking test 016 fv3_ccpp_lheatstrg results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_lheatstrg
+Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -975,14 +975,14 @@ Checking test 016 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.610248
+The total amount of wall time                        = 46.329600
 
-Test 016 fv3_ccpp_lheatstrg PASS
+Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_multigases_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_multigases_prod
-Checking test 017 fv3_ccpp_multigases results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_multigases_repro
+Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1052,14 +1052,14 @@ Checking test 017 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 100.030948
+The total amount of wall time                        = 109.322209
 
-Test 017 fv3_ccpp_multigases PASS
+Test 017 fv3_multigases PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_32bit_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_control_32bit_prod
-Checking test 018 fv3_ccpp_control_32bit results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control_32bit
+Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1123,14 +1123,14 @@ Checking test 018 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 39.798607
+The total amount of wall time                        = 40.080135
 
-Test 018 fv3_ccpp_control_32bit PASS
+Test 018 fv3_control_32bit PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_stretched_prod
-Checking test 019 fv3_ccpp_stretched results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched
+Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1182,14 +1182,14 @@ Checking test 019 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 332.262419
+The total amount of wall time                        = 330.931597
 
-Test 019 fv3_ccpp_stretched PASS
+Test 019 fv3_stretched PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_stretched_nest_prod
-Checking test 020 fv3_ccpp_stretched_nest results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched_nest
+Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1252,40 +1252,40 @@ Checking test 020 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 352.713671
+The total amount of wall time                        = 343.913204
 
-Test 020 fv3_ccpp_stretched_nest PASS
+Test 020 fv3_stretched_nest PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_control_prod
-Checking test 021 fv3_ccpp_regional_control results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_control
+Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 697.059129
+The total amount of wall time                        = 716.261602
 
-Test 021 fv3_ccpp_regional_control PASS
+Test 021 fv3_regional_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_restart_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_restart_prod
-Checking test 022 fv3_ccpp_regional_restart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_restart
+Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 393.423672
+The total amount of wall time                        = 391.516587
 
-Test 022 fv3_ccpp_regional_restart PASS
+Test 022 fv3_regional_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_quilt_prod
-Checking test 023 fv3_ccpp_regional_quilt results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt
+Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1295,14 +1295,14 @@ Checking test 023 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 721.982896
+The total amount of wall time                        = 740.845723
 
-Test 023 fv3_ccpp_regional_quilt PASS
+Test 023 fv3_regional_quilt PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_hafs_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt_hafs
+Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1310,28 +1310,28 @@ Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 719.201196
+The total amount of wall time                        = 737.470533
 
-Test 024 fv3_ccpp_regional_quilt_hafs PASS
+Test 024 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 025 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt_netcdf_parallel
+Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
- Comparing phyf000.nc ............ALT CHECK......OK
+ Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 719.995982
+The total amount of wall time                        = 741.687853
 
-Test 025 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfdlmp_prod
-Checking test 026 fv3_ccpp_gfdlmp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmp
+Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1375,14 +1375,14 @@ Checking test 026 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.034811
+The total amount of wall time                        = 51.724523
 
-Test 026 fv3_ccpp_gfdlmp PASS
+Test 026 fv3_gfdlmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_gwd_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_gwd
+Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1426,14 +1426,14 @@ Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.183759
+The total amount of wall time                        = 52.482174
 
-Test 027 fv3_ccpp_gfdlmprad_gwd PASS
+Test 027 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_noahmp
+Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1477,14 +1477,14 @@ Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.277267
+The total amount of wall time                        = 52.864785
 
-Test 028 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 028 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_csawmg_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_csawmg_prod
-Checking test 029 fv3_ccpp_csawmg results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_csawmg
+Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1528,14 +1528,14 @@ Checking test 029 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 143.654699
+The total amount of wall time                        = 137.691614
 
-Test 029 fv3_ccpp_csawmg PASS
+Test 029 fv3_csawmg PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmf_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_satmedmf_prod
-Checking test 030 fv3_ccpp_satmedmf results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_satmedmf
+Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1579,14 +1579,14 @@ Checking test 030 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.495493
+The total amount of wall time                        = 59.102946
 
-Test 030 fv3_ccpp_satmedmf PASS
+Test 030 fv3_satmedmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmfq_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_satmedmfq_prod
-Checking test 031 fv3_ccpp_satmedmfq results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_satmedmfq
+Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1630,14 +1630,14 @@ Checking test 031 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.806768
+The total amount of wall time                        = 58.919454
 
-Test 031 fv3_ccpp_satmedmfq PASS
+Test 031 fv3_satmedmfq PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_32bit_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmp_32bit
+Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1681,14 +1681,14 @@ Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 41.514249
+The total amount of wall time                        = 41.538693
 
-Test 032 fv3_ccpp_gfdlmp_32bit PASS
+Test 032 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_32bit_post
+Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1736,14 +1736,14 @@ Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 72.929668
+The total amount of wall time                        = 72.990521
 
-Test 033 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_cpt_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_cpt_prod
-Checking test 034 fv3_ccpp_cpt results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_cpt
+Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1793,14 +1793,14 @@ Checking test 034 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 337.243573
+The total amount of wall time                        = 324.277909
 
-Test 034 fv3_ccpp_cpt PASS
+Test 034 fv3_cpt PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gsd_prod
-Checking test 035 fv3_ccpp_gsd results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd
+Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1888,14 +1888,14 @@ Checking test 035 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 202.150818
+The total amount of wall time                        = 200.510933
 
-Test 035 fv3_ccpp_gsd PASS
+Test 035 fv3_gsd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rap_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_rap_prod
-Checking test 036 fv3_ccpp_rap results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rap
+Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1959,14 +1959,14 @@ Checking test 036 fv3_ccpp_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.012787
+The total amount of wall time                        = 102.523415
 
-Test 036 fv3_ccpp_rap PASS
+Test 036 fv3_rap PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_hrrr_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_hrrr_prod
-Checking test 037 fv3_ccpp_hrrr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_hrrr
+Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2030,14 +2030,14 @@ Checking test 037 fv3_ccpp_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.934973
+The total amount of wall time                        = 106.593038
 
-Test 037 fv3_ccpp_hrrr PASS
+Test 037 fv3_hrrr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_thompson_prod
-Checking test 038 fv3_ccpp_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson
+Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2101,14 +2101,14 @@ Checking test 038 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.340112
+The total amount of wall time                        = 96.257675
 
-Test 038 fv3_ccpp_thompson PASS
+Test 038 fv3_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_thompson_no_aero_prod
-Checking test 039 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_no_aero
+Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2172,14 +2172,14 @@ Checking test 039 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 91.907068
+The total amount of wall time                        = 91.158832
 
-Test 039 fv3_ccpp_thompson_no_aero PASS
+Test 039 fv3_thompson_no_aero PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_rrfs_v1beta_prod
-Checking test 040 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rrfs_v1beta
+Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2243,14 +2243,14 @@ Checking test 040 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.837113
+The total amount of wall time                        = 108.271884
 
-Test 040 fv3_ccpp_rrfs_v1beta PASS
+Test 040 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_prod
-Checking test 041 fv3_ccpp_gfs_v16 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16
+Checking test 041 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2326,14 +2326,14 @@ Checking test 041 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 131.379843
+The total amount of wall time                        = 130.052721
 
-Test 041 fv3_ccpp_gfs_v16 PASS
+Test 041 fv3_gfs_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_restart_prod
-Checking test 042 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_restart
+Checking test 042 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2379,14 +2379,14 @@ Checking test 042 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 68.766847
+The total amount of wall time                        = 69.465290
 
-Test 042 fv3_ccpp_gfs_v16_restart PASS
+Test 042 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_stochy_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 043 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_stochy
+Checking test 043 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2450,14 +2450,14 @@ Checking test 043 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 64.512770
+The total amount of wall time                        = 62.916099
 
-Test 043 fv3_ccpp_gfs_v16_stochy PASS
+Test 043 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 044 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP
+Checking test 044 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2521,14 +2521,14 @@ Checking test 044 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 220.814664
+The total amount of wall time                        = 220.380142
 
-Test 044 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 044 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 045 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 045 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2586,14 +2586,14 @@ Checking test 045 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 930.889339
+The total amount of wall time                        = 834.952485
 
-Test 045 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 045 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 046 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 046 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2657,14 +2657,14 @@ Checking test 046 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 473.296524
+The total amount of wall time                        = 466.870817
 
-Test 046 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 046 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gocart_clm_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gocart_clm_prod
-Checking test 047 fv3_ccpp_gocart_clm results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gocart_clm
+Checking test 047 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2708,14 +2708,14 @@ Checking test 047 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.904422
+The total amount of wall time                        = 58.031058
 
-Test 047 fv3_ccpp_gocart_clm PASS
+Test 047 fv3_gocart_clm PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_flake_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_flake_prod
-Checking test 048 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_flake
+Checking test 048 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2779,14 +2779,14 @@ Checking test 048 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 112.350998
+The total amount of wall time                        = 106.579599
 
-Test 048 fv3_ccpp_gfs_v16_flake PASS
+Test 048 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 049 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_HAFS_v0_hwrf_thompson
+Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2850,14 +2850,14 @@ Checking test 049 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 195.980362
+The total amount of wall time                        = 196.376108
 
-Test 049 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 049 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -2871,14 +2871,14 @@ Checking test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 340.106487
+The total amount of wall time                        = 323.367695
 
-Test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 050 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 051 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1
+Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2936,14 +2936,14 @@ Checking test 051 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 216.277636
+The total amount of wall time                        = 215.379700
 
-Test 051 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 051 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1_warmstart
+Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3001,14 +3001,85 @@ Checking test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 218.815280
+The total amount of wall time                        = 218.012111
 
-Test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 052 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 053 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_ras
+Checking test 053 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 115.689935
+
+Test 053 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v15p2_debug
+Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3072,14 +3143,14 @@ Checking test 053 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 245.075230
+The total amount of wall time                        = 245.407283
 
-Test 053 fv3_ccpp_gfs_v15p2_debug PASS
+Test 054 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_debug_prod
-Checking test 054 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_debug
+Checking test 055 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3143,14 +3214,14 @@ Checking test 054 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 189.406938
+The total amount of wall time                        = 190.404620
 
-Test 054 fv3_ccpp_gfs_v16_debug PASS
+Test 055 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3214,14 +3285,14 @@ Checking test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 386.295980
+The total amount of wall time                        = 384.474234
 
-Test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 056 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 056 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_debug
+Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3285,28 +3356,28 @@ Checking test 056 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 392.440028
+The total amount of wall time                        = 393.114772
 
-Test 056 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 057 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_regional_control_debug_prod
-Checking test 057 fv3_ccpp_regional_control_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_control_debug
+Checking test 058 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 366.831849
+The total amount of wall time                        = 366.899380
 
-Test 057 fv3_ccpp_regional_control_debug PASS
+Test 058 fv3_regional_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_control_debug_prod
-Checking test 058 fv3_ccpp_control_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control_debug
+Checking test 059 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3332,14 +3403,14 @@ Checking test 058 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 146.508217
+The total amount of wall time                        = 146.618466
 
-Test 058 fv3_ccpp_control_debug PASS
+Test 059 fv3_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_stretched_nest_debug_prod
-Checking test 059 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched_nest_debug
+Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3355,14 +3426,14 @@ Checking test 059 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 433.334427
+The total amount of wall time                        = 432.998634
 
-Test 059 fv3_ccpp_stretched_nest_debug PASS
+Test 060 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gsd_debug_prod
-Checking test 060 fv3_ccpp_gsd_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd_debug
+Checking test 061 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3426,14 +3497,14 @@ Checking test 060 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 217.347536
+The total amount of wall time                        = 216.755184
 
-Test 060 fv3_ccpp_gsd_debug PASS
+Test 061 fv3_gsd_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_diag3d_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 061 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd_diag3d_debug
+Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3497,14 +3568,14 @@ Checking test 061 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 263.045850
+The total amount of wall time                        = 261.555642
 
-Test 061 fv3_ccpp_gsd_diag3d_debug PASS
+Test 062 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_thompson_debug_prod
-Checking test 062 fv3_ccpp_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_debug
+Checking test 063 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3568,14 +3639,14 @@ Checking test 062 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 360.692633
+The total amount of wall time                        = 360.248777
 
-Test 062 fv3_ccpp_thompson_debug PASS
+Test 063 fv3_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 063 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_no_aero_debug
+Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3639,14 +3710,14 @@ Checking test 063 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 347.414141
+The total amount of wall time                        = 348.057383
 
-Test 063 fv3_ccpp_thompson_no_aero_debug PASS
+Test 064 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 064 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rrfs_v1beta_debug
+Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3710,14 +3781,14 @@ Checking test 064 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 209.642159
+The total amount of wall time                        = 209.467344
 
-Test 064 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 065 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3781,14 +3852,14 @@ Checking test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 223.759105
+The total amount of wall time                        = 223.594519
 
-Test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 066 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -3802,14 +3873,14 @@ Checking test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 398.279909
+The total amount of wall time                        = 397.519750
 
-Test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 067 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1_debug
+Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3867,14 +3938,85 @@ Checking test 067 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 602.635373
+The total amount of wall time                        = 604.477397
+
+Test 068 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_ras_debug
+Checking test 069 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 343.084605
 
-Test 067 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 069 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_control_prod
-Checking test 068 cpld_control results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control
+Checking test 070 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -3923,14 +4065,14 @@ Checking test 068 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 98.377069
+The total amount of wall time                        = 94.330202
 
-Test 068 cpld_control PASS
+Test 070 cpld_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_prod
-Checking test 069 cpld_restart results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart
+Checking test 071 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -3979,14 +4121,14 @@ Checking test 069 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 54.551793
+The total amount of wall time                        = 54.509987
 
-Test 069 cpld_restart PASS
+Test 071 cpld_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_controlfrac_prod
-Checking test 070 cpld_controlfrac results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac
+Checking test 072 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4035,14 +4177,14 @@ Checking test 070 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 97.847198
+The total amount of wall time                        = 97.537951
 
-Test 070 cpld_controlfrac PASS
+Test 072 cpld_controlfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restartfrac_prod
-Checking test 071 cpld_restartfrac results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac
+Checking test 073 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4091,14 +4233,14 @@ Checking test 071 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 54.553696
+The total amount of wall time                        = 54.634580
 
-Test 071 cpld_restartfrac PASS
+Test 073 cpld_restartfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_2threads_prod
-Checking test 072 cpld_2threads results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_2threads
+Checking test 074 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4147,14 +4289,14 @@ Checking test 072 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 258.589961
+The total amount of wall time                        = 260.143343
 
-Test 072 cpld_2threads PASS
+Test 074 cpld_2threads PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_decomp_prod
-Checking test 073 cpld_decomp results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_decomp
+Checking test 075 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4203,14 +4345,14 @@ Checking test 073 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 97.809631
+The total amount of wall time                        = 96.188274
 
-Test 073 cpld_decomp PASS
+Test 075 cpld_decomp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_satmedmf_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_satmedmf_prod
-Checking test 074 cpld_satmedmf results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_satmedmf
+Checking test 076 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4259,14 +4401,14 @@ Checking test 074 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 97.610598
+The total amount of wall time                        = 95.901729
 
-Test 074 cpld_satmedmf PASS
+Test 076 cpld_satmedmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_ca_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_ca_prod
-Checking test 075 cpld_ca results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_ca
+Checking test 077 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4315,14 +4457,14 @@ Checking test 075 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 97.401858
+The total amount of wall time                        = 95.998523
 
-Test 075 cpld_ca PASS
+Test 077 cpld_ca PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_control_c192_prod
-Checking test 076 cpld_control_c192 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_c192
+Checking test 078 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4371,14 +4513,14 @@ Checking test 076 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 409.284226
+The total amount of wall time                        = 409.876274
 
-Test 076 cpld_control_c192 PASS
+Test 078 cpld_control_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_c192_prod
-Checking test 077 cpld_restart_c192 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_c192
+Checking test 079 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4427,14 +4569,14 @@ Checking test 077 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 294.268034
+The total amount of wall time                        = 288.008984
 
-Test 077 cpld_restart_c192 PASS
+Test 079 cpld_restart_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_controlfrac_c192_prod
-Checking test 078 cpld_controlfrac_c192 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac_c192
+Checking test 080 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4483,14 +4625,14 @@ Checking test 078 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 402.603821
+The total amount of wall time                        = 408.893341
 
-Test 078 cpld_controlfrac_c192 PASS
+Test 080 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restartfrac_c192_prod
-Checking test 079 cpld_restartfrac_c192 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac_c192
+Checking test 081 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4539,14 +4681,14 @@ Checking test 079 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 291.241116
+The total amount of wall time                        = 287.403359
 
-Test 079 cpld_restartfrac_c192 PASS
+Test 081 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_control_c384_prod
-Checking test 080 cpld_control_c384 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_c384
+Checking test 082 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4598,14 +4740,14 @@ Checking test 080 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1603.600871
+The total amount of wall time                        = 1600.512764
 
-Test 080 cpld_control_c384 PASS
+Test 082 cpld_control_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_c384_prod
-Checking test 081 cpld_restart_c384 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_c384
+Checking test 083 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4657,14 +4799,14 @@ Checking test 081 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 787.647056
+The total amount of wall time                        = 839.420761
 
-Test 081 cpld_restart_c384 PASS
+Test 083 cpld_restart_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_controlfrac_c384_prod
-Checking test 082 cpld_controlfrac_c384 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac_c384
+Checking test 084 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4716,14 +4858,14 @@ Checking test 082 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1593.509229
+The total amount of wall time                        = 1591.439482
 
-Test 082 cpld_controlfrac_c384 PASS
+Test 084 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restartfrac_c384_prod
-Checking test 083 cpld_restartfrac_c384 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac_c384
+Checking test 085 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4775,14 +4917,14 @@ Checking test 083 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 782.643788
+The total amount of wall time                        = 832.477485
 
-Test 083 cpld_restartfrac_c384 PASS
+Test 085 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmark_prod
-Checking test 084 cpld_bmark results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmark
+Checking test 086 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4834,14 +4976,14 @@ Checking test 084 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 912.535304
+The total amount of wall time                        = 910.591583
 
-Test 084 cpld_bmark PASS
+Test 086 cpld_bmark PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_bmark_prod
-Checking test 085 cpld_restart_bmark results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmark
+Checking test 087 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4893,14 +5035,14 @@ Checking test 085 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 496.944038
+The total amount of wall time                        = 492.644072
 
-Test 085 cpld_restart_bmark PASS
+Test 087 cpld_restart_bmark PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmarkfrac_prod
-Checking test 086 cpld_bmarkfrac results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac
+Checking test 088 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4952,14 +5094,14 @@ Checking test 086 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 903.261741
+The total amount of wall time                        = 942.768192
 
-Test 086 cpld_bmarkfrac PASS
+Test 088 cpld_bmarkfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_bmarkfrac_prod
-Checking test 087 cpld_restart_bmarkfrac results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmarkfrac
+Checking test 089 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5011,14 +5153,14 @@ Checking test 087 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 492.256702
+The total amount of wall time                        = 490.677498
 
-Test 087 cpld_restart_bmarkfrac PASS
+Test 089 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmarkfrac_v16_prod
-Checking test 088 cpld_bmarkfrac_v16 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_v16
+Checking test 090 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5070,14 +5212,14 @@ Checking test 088 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 1637.182420
+The total amount of wall time                        = 1619.458789
 
-Test 088 cpld_bmarkfrac_v16 PASS
+Test 090 cpld_bmarkfrac_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_restart_bmarkfrac_v16_prod
-Checking test 089 cpld_restart_bmarkfrac_v16 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmarkfrac_v16
+Checking test 091 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5129,14 +5271,14 @@ Checking test 089 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 894.252000
+The total amount of wall time                        = 876.345179
 
-Test 089 cpld_restart_bmarkfrac_v16 PASS
+Test 091 cpld_restart_bmarkfrac_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_wave_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmark_wave_prod
-Checking test 090 cpld_bmark_wave results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmark_wave
+Checking test 092 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5191,14 +5333,14 @@ Checking test 090 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1568.690744
+The total amount of wall time                        = 1579.004437
 
-Test 090 cpld_bmark_wave PASS
+Test 092 cpld_bmark_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmarkfrac_wave_prod
-Checking test 091 cpld_bmarkfrac_wave results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_wave
+Checking test 093 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5253,14 +5395,14 @@ Checking test 091 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1566.777312
+The total amount of wall time                        = 1564.991092
 
-Test 091 cpld_bmarkfrac_wave PASS
+Test 093 cpld_bmarkfrac_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_v16_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_bmarkfrac_wave_v16_prod
-Checking test 092 cpld_bmarkfrac_wave_v16 results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_wave_v16
+Checking test 094 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5314,14 +5456,14 @@ Checking test 092 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-The total amount of wall time                        = 1043.280968
+The total amount of wall time                        = 1037.828157
 
-Test 092 cpld_bmarkfrac_wave_v16 PASS
+Test 094 cpld_bmarkfrac_wave_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_wave_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_control_wave_prod
-Checking test 093 cpld_control_wave results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_wave
+Checking test 095 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5373,14 +5515,14 @@ Checking test 093 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-The total amount of wall time                        = 814.173459
+The total amount of wall time                        = 813.195210
 
-Test 093 cpld_control_wave PASS
+Test 095 cpld_control_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debug_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_debug_prod
-Checking test 094 cpld_debug results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_debug
+Checking test 096 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5429,14 +5571,14 @@ Checking test 094 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 307.202595
+The total amount of wall time                        = 310.532484
 
-Test 094 cpld_debug PASS
+Test 096 cpld_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debugfrac_ccpp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/cpld_debugfrac_prod
-Checking test 095 cpld_debugfrac results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_debugfrac
+Checking test 097 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5485,74 +5627,74 @@ Checking test 095 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 305.519940
+The total amount of wall time                        = 305.075755
 
-Test 095 cpld_debugfrac PASS
+Test 097 cpld_debugfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_control_cfsr
-Checking test 096 datm_control_cfsr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_control_cfsr
+Checking test 098 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 102.254750
+The total amount of wall time                        = 102.179644
 
-Test 096 datm_control_cfsr PASS
+Test 098 datm_control_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_restart_cfsr
-Checking test 097 datm_restart_cfsr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_restart_cfsr
+Checking test 099 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 64.874934
+The total amount of wall time                        = 61.928971
 
-Test 097 datm_restart_cfsr PASS
+Test 099 datm_restart_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_control_gefs
-Checking test 098 datm_control_gefs results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_control_gefs
+Checking test 100 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 92.312934
+The total amount of wall time                        = 95.586184
 
-Test 098 datm_control_gefs PASS
+Test 100 datm_control_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_bulk_cfsr
-Checking test 099 datm_bulk_cfsr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_bulk_cfsr
+Checking test 101 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 98.579826
+The total amount of wall time                        = 98.097471
 
-Test 099 datm_bulk_cfsr PASS
+Test 101 datm_bulk_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_bulk_gefs
-Checking test 100 datm_bulk_gefs results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_bulk_gefs
+Checking test 102 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 96.718155
+The total amount of wall time                        = 96.061119
 
-Test 100 datm_bulk_gefs PASS
+Test 102 datm_bulk_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_mx025_cfsr
-Checking test 101 datm_mx025_cfsr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_mx025_cfsr
+Checking test 103 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5560,14 +5702,14 @@ Checking test 101 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 395.791816
+The total amount of wall time                        = 391.962767
 
-Test 101 datm_mx025_cfsr PASS
+Test 103 datm_mx025_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_mx025_gefs
-Checking test 102 datm_mx025_gefs results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_mx025_gefs
+Checking test 104 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5575,23 +5717,23 @@ Checking test 102 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 373.193171
+The total amount of wall time                        = 389.212635
 
-Test 102 datm_mx025_gefs PASS
+Test 104 datm_mx025_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_debug_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_67492/datm_debug_cfsr
-Checking test 103 datm_debug_cfsr results ....
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_debug_cfsr
+Checking test 105 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 285.512419
+The total amount of wall time                        = 286.252814
 
-Test 103 datm_debug_cfsr PASS
+Test 105 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 16:50:40 MDT 2021
-Elapsed time: 01h:36m:59s. Have a nice day!
+Wed Mar 17 16:56:57 MDT 2021
+Elapsed time: 01h:56m:42s. Have a nice day!
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
index 33e7e78571..b577ab36e8 100644
--- a/tests/RegressionTests_gaea.intel.log
+++ b/tests/RegressionTests_gaea.intel.log
@@ -1,10 +1,10 @@
-Mon Mar 15 11:33:54 EDT 2021
+Wed Mar 17 15:32:59 EDT 2021
 Start Regression test
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +68,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.202716
+The total amount of wall time                        = 102.485374
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_decomp_prod
-Checking test 002 fv3_ccpp_decomp results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_decomp
+Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +139,14 @@ Checking test 002 fv3_ccpp_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.422483
+The total amount of wall time                        = 72.102716
 
-Test 002 fv3_ccpp_decomp PASS
+Test 002 fv3_decomp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_2threads_prod
-Checking test 003 fv3_ccpp_2threads results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_2threads
+Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -210,14 +210,14 @@ Checking test 003 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 63.621933
+The total amount of wall time                        = 56.773568
 
-Test 003 fv3_ccpp_2threads PASS
+Test 003 fv3_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_restart_prod
-Checking test 004 fv3_ccpp_restart results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_restart
+Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -263,14 +263,14 @@ Checking test 004 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 25.530793
+The total amount of wall time                        = 21.193289
 
-Test 004 fv3_ccpp_restart PASS
+Test 004 fv3_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_read_inc_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_read_inc_prod
-Checking test 005 fv3_ccpp_read_inc results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_read_inc
+Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -334,14 +334,14 @@ Checking test 005 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.608474
+The total amount of wall time                        = 41.536547
 
-Test 005 fv3_ccpp_read_inc PASS
+Test 005 fv3_read_inc PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf_esmf
+Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -385,14 +385,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 103.548563
+The total amount of wall time                        = 130.242622
 
-Test 006 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf
+Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -436,14 +436,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 41.781802
+The total amount of wall time                        = 73.005528
 
-Test 007 fv3_ccpp_wrtGauss_netcdf PASS
+Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf_parallel
+Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -487,14 +487,14 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 119.304346
+The total amount of wall time                        = 62.012410
 
-Test 008 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGlatlon_netcdf
+Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -538,14 +538,14 @@ Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 42.524630
+The total amount of wall time                        = 67.968061
 
-Test 009 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_nemsio
+Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -589,14 +589,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 40.850460
+The total amount of wall time                        = 92.057050
 
-Test 010 fv3_ccpp_wrtGauss_nemsio PASS
+Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_nemsio_c192
+Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +640,14 @@ Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 112.714340
+The total amount of wall time                        = 109.756012
 
-Test 011 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stochy_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_stochy_prod
-Checking test 012 fv3_ccpp_stochy results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stochy
+Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +711,14 @@ Checking test 012 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.386574
+The total amount of wall time                        = 48.024480
 
-Test 012 fv3_ccpp_stochy PASS
+Test 012 fv3_stochy PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ca_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_ca_prod
-Checking test 013 fv3_ccpp_ca results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_ca
+Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +782,14 @@ Checking test 013 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 34.888770
+The total amount of wall time                        = 29.883390
 
-Test 013 fv3_ccpp_ca PASS
+Test 013 fv3_ca PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lndp_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_lndp_prod
-Checking test 014 fv3_ccpp_lndp results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_lndp
+Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +853,14 @@ Checking test 014 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.942397
+The total amount of wall time                        = 52.541476
 
-Test 014 fv3_ccpp_lndp PASS
+Test 014 fv3_lndp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_iau_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_iau_prod
-Checking test 015 fv3_ccpp_iau results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_iau
+Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -924,14 +924,14 @@ Checking test 015 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.545194
+The total amount of wall time                        = 67.247275
 
-Test 015 fv3_ccpp_iau PASS
+Test 015 fv3_iau PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lheatstrg_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_lheatstrg_prod
-Checking test 016 fv3_ccpp_lheatstrg results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_lheatstrg
+Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -975,14 +975,14 @@ Checking test 016 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.328518
+The total amount of wall time                        = 69.819128
 
-Test 016 fv3_ccpp_lheatstrg PASS
+Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_multigases_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_multigases_prod
-Checking test 017 fv3_ccpp_multigases results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_multigases_repro
+Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1052,14 +1052,14 @@ Checking test 017 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 86.788859
+The total amount of wall time                        = 98.505522
 
-Test 017 fv3_ccpp_multigases PASS
+Test 017 fv3_multigases PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_32bit_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_control_32bit_prod
-Checking test 018 fv3_ccpp_control_32bit results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control_32bit
+Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1123,14 +1123,14 @@ Checking test 018 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 42.716204
+The total amount of wall time                        = 39.663154
 
-Test 018 fv3_ccpp_control_32bit PASS
+Test 018 fv3_control_32bit PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_stretched_prod
-Checking test 019 fv3_ccpp_stretched results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched
+Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1182,14 +1182,14 @@ Checking test 019 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 310.401709
+The total amount of wall time                        = 332.390533
 
-Test 019 fv3_ccpp_stretched PASS
+Test 019 fv3_stretched PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_stretched_nest_prod
-Checking test 020 fv3_ccpp_stretched_nest results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched_nest
+Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1252,40 +1252,40 @@ Checking test 020 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 337.151113
+The total amount of wall time                        = 363.772572
 
-Test 020 fv3_ccpp_stretched_nest PASS
+Test 020 fv3_stretched_nest PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_control_prod
-Checking test 021 fv3_ccpp_regional_control results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_control
+Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 673.135357
+The total amount of wall time                        = 671.029829
 
-Test 021 fv3_ccpp_regional_control PASS
+Test 021 fv3_regional_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_restart_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_restart_prod
-Checking test 022 fv3_ccpp_regional_restart results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_restart
+Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 372.152868
+The total amount of wall time                        = 368.134453
 
-Test 022 fv3_ccpp_regional_restart PASS
+Test 022 fv3_regional_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_quilt_prod
-Checking test 023 fv3_ccpp_regional_quilt results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt
+Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1295,14 +1295,14 @@ Checking test 023 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 696.496583
+The total amount of wall time                        = 692.031281
 
-Test 023 fv3_ccpp_regional_quilt PASS
+Test 023 fv3_regional_quilt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_hafs_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt_hafs
+Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1310,28 +1310,28 @@ Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 690.496928
+The total amount of wall time                        = 688.414005
 
-Test 024 fv3_ccpp_regional_quilt_hafs PASS
+Test 024 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 025 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt_netcdf_parallel
+Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc ............ALT CHECK......OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
 
-The total amount of wall time                        = 696.943945
+The total amount of wall time                        = 691.740751
 
-Test 025 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfdlmp_prod
-Checking test 026 fv3_ccpp_gfdlmp results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmp
+Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1375,14 +1375,14 @@ Checking test 026 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 50.896308
+The total amount of wall time                        = 75.604375
 
-Test 026 fv3_ccpp_gfdlmp PASS
+Test 026 fv3_gfdlmp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_gwd_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_gwd
+Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1426,14 +1426,14 @@ Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 49.231900
+The total amount of wall time                        = 47.142772
 
-Test 027 fv3_ccpp_gfdlmprad_gwd PASS
+Test 027 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_noahmp
+Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1477,14 +1477,14 @@ Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.333800
+The total amount of wall time                        = 46.771940
 
-Test 028 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 028 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_csawmg_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_csawmg_prod
-Checking test 029 fv3_ccpp_csawmg results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_csawmg
+Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1528,14 +1528,14 @@ Checking test 029 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 126.509770
+The total amount of wall time                        = 149.960741
 
-Test 029 fv3_ccpp_csawmg PASS
+Test 029 fv3_csawmg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmf_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_satmedmf_prod
-Checking test 030 fv3_ccpp_satmedmf results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_satmedmf
+Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1579,14 +1579,14 @@ Checking test 030 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.905065
+The total amount of wall time                        = 79.670296
 
-Test 030 fv3_ccpp_satmedmf PASS
+Test 030 fv3_satmedmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmfq_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_satmedmfq_prod
-Checking test 031 fv3_ccpp_satmedmfq results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_satmedmfq
+Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1630,14 +1630,14 @@ Checking test 031 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.400283
+The total amount of wall time                        = 51.506543
 
-Test 031 fv3_ccpp_satmedmfq PASS
+Test 031 fv3_satmedmfq PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_32bit_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmp_32bit
+Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1681,14 +1681,14 @@ Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.138256
+The total amount of wall time                        = 69.878808
 
-Test 032 fv3_ccpp_gfdlmp_32bit PASS
+Test 032 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_32bit_post
+Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1736,14 +1736,14 @@ Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 80.114644
+The total amount of wall time                        = 77.396202
 
-Test 033 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_cpt_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_cpt_prod
-Checking test 034 fv3_ccpp_cpt results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_cpt
+Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1793,14 +1793,14 @@ Checking test 034 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 308.652566
+The total amount of wall time                        = 288.651895
 
-Test 034 fv3_ccpp_cpt PASS
+Test 034 fv3_cpt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gsd_prod
-Checking test 035 fv3_ccpp_gsd results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd
+Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1888,14 +1888,14 @@ Checking test 035 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.917140
+The total amount of wall time                        = 192.839897
 
-Test 035 fv3_ccpp_gsd PASS
+Test 035 fv3_gsd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rap_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_rap_prod
-Checking test 036 fv3_ccpp_rap results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rap
+Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1959,14 +1959,14 @@ Checking test 036 fv3_ccpp_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 97.420971
+The total amount of wall time                        = 96.174180
 
-Test 036 fv3_ccpp_rap PASS
+Test 036 fv3_rap PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_hrrr_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_hrrr_prod
-Checking test 037 fv3_ccpp_hrrr results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_hrrr
+Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2030,14 +2030,14 @@ Checking test 037 fv3_ccpp_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 100.507409
+The total amount of wall time                        = 116.171670
 
-Test 037 fv3_ccpp_hrrr PASS
+Test 037 fv3_hrrr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_thompson_prod
-Checking test 038 fv3_ccpp_thompson results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson
+Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2101,14 +2101,14 @@ Checking test 038 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 100.859710
+The total amount of wall time                        = 90.491086
 
-Test 038 fv3_ccpp_thompson PASS
+Test 038 fv3_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_thompson_no_aero_prod
-Checking test 039 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_no_aero
+Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2172,14 +2172,14 @@ Checking test 039 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 89.024713
+The total amount of wall time                        = 85.585007
 
-Test 039 fv3_ccpp_thompson_no_aero PASS
+Test 039 fv3_thompson_no_aero PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_rrfs_v1beta_prod
-Checking test 040 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rrfs_v1beta
+Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2243,14 +2243,14 @@ Checking test 040 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.226849
+The total amount of wall time                        = 120.673515
 
-Test 040 fv3_ccpp_rrfs_v1beta PASS
+Test 040 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v15p2_prod
-Checking test 041 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2
+Checking test 041 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2314,14 +2314,14 @@ Checking test 041 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.561811
+The total amount of wall time                        = 129.877411
 
-Test 041 fv3_ccpp_gfs_v15p2 PASS
+Test 041 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_prod
-Checking test 042 fv3_ccpp_gfs_v16 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16
+Checking test 042 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2397,14 +2397,14 @@ Checking test 042 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.109903
+The total amount of wall time                        = 145.397896
 
-Test 042 fv3_ccpp_gfs_v16 PASS
+Test 042 fv3_gfs_v16 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_restart_prod
-Checking test 043 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_restart
+Checking test 043 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2450,14 +2450,14 @@ Checking test 043 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 70.816141
+The total amount of wall time                        = 60.858808
 
-Test 043 fv3_ccpp_gfs_v16_restart PASS
+Test 043 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_stochy_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 044 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_stochy
+Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2521,14 +2521,14 @@ Checking test 044 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.624361
+The total amount of wall time                        = 82.493794
 
-Test 044 fv3_ccpp_gfs_v16_stochy PASS
+Test 044 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 045 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_RRTMGP
+Checking test 045 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2592,14 +2592,14 @@ Checking test 045 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.279333
+The total amount of wall time                        = 185.233689
 
-Test 045 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 045 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 046 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP
+Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2663,14 +2663,14 @@ Checking test 046 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 198.279861
+The total amount of wall time                        = 187.969992
 
-Test 046 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 046 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2728,14 +2728,14 @@ Checking test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 724.420639
+The total amount of wall time                        = 733.570211
 
-Test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 047 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2799,14 +2799,14 @@ Checking test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 289.246314
+The total amount of wall time                        = 282.897222
 
-Test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 048 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmg_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfsv16_csawmg_prod
-Checking test 049 fv3_ccpp_gfsv16_csawmg results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_csawmg
+Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2850,14 +2850,14 @@ Checking test 049 fv3_ccpp_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 160.717652
+The total amount of wall time                        = 132.452220
 
-Test 049 fv3_ccpp_gfsv16_csawmg PASS
+Test 049 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmgt_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfsv16_csawmgt_prod
-Checking test 050 fv3_ccpp_gfsv16_csawmgt results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_csawmgt
+Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2901,14 +2901,14 @@ Checking test 050 fv3_ccpp_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 135.358067
+The total amount of wall time                        = 130.527004
 
-Test 050 fv3_ccpp_gfsv16_csawmgt PASS
+Test 050 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gocart_clm_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gocart_clm_prod
-Checking test 051 fv3_ccpp_gocart_clm results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gocart_clm
+Checking test 051 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2952,14 +2952,14 @@ Checking test 051 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 56.265930
+The total amount of wall time                        = 56.881795
 
-Test 051 fv3_ccpp_gocart_clm PASS
+Test 051 fv3_gocart_clm PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_flake_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_flake_prod
-Checking test 052 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_flake
+Checking test 052 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3023,14 +3023,14 @@ Checking test 052 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 150.911054
+The total amount of wall time                        = 116.827340
 
-Test 052 fv3_ccpp_gfs_v16_flake PASS
+Test 052 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 053 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_HAFS_v0_hwrf_thompson
+Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3094,14 +3094,14 @@ Checking test 053 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 165.912999
+The total amount of wall time                        = 161.380788
 
-Test 053 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 053 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -3115,14 +3115,14 @@ Checking test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 330.719092
+The total amount of wall time                        = 310.000662
 
-Test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 054 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 055 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1
+Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3180,14 +3180,14 @@ Checking test 055 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 188.806294
+The total amount of wall time                        = 184.639949
 
-Test 055 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 055 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1_warmstart
+Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3245,14 +3245,85 @@ Checking test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 187.875190
+The total amount of wall time                        = 212.647393
 
-Test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 056 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 057 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_ras
+Checking test 057 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 128.544225
+
+Test 057 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_debug
+Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3316,14 +3387,14 @@ Checking test 057 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 239.583893
+The total amount of wall time                        = 235.095911
 
-Test 057 fv3_ccpp_gfs_v15p2_debug PASS
+Test 058 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_debug_prod
-Checking test 058 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_debug
+Checking test 059 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3387,14 +3458,14 @@ Checking test 058 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 175.667525
+The total amount of wall time                        = 199.460156
 
-Test 058 fv3_ccpp_gfs_v16_debug PASS
+Test 059 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3458,14 +3529,14 @@ Checking test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 380.015984
+The total amount of wall time                        = 374.563559
 
-Test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 060 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 060 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_debug
+Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3529,28 +3600,28 @@ Checking test 060 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 382.399233
+The total amount of wall time                        = 381.595627
 
-Test 060 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 061 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_regional_control_debug_prod
-Checking test 061 fv3_ccpp_regional_control_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_control_debug
+Checking test 062 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 368.997322
+The total amount of wall time                        = 367.593608
 
-Test 061 fv3_ccpp_regional_control_debug PASS
+Test 062 fv3_regional_control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_control_debug_prod
-Checking test 062 fv3_ccpp_control_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control_debug
+Checking test 063 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3576,14 +3647,14 @@ Checking test 062 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 129.907206
+The total amount of wall time                        = 128.752562
 
-Test 062 fv3_ccpp_control_debug PASS
+Test 063 fv3_control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_stretched_nest_debug_prod
-Checking test 063 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched_nest_debug
+Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3599,14 +3670,14 @@ Checking test 063 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 436.163004
+The total amount of wall time                        = 436.695048
 
-Test 063 fv3_ccpp_stretched_nest_debug PASS
+Test 064 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gsd_debug_prod
-Checking test 064 fv3_ccpp_gsd_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd_debug
+Checking test 065 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3670,14 +3741,14 @@ Checking test 064 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 195.328983
+The total amount of wall time                        = 227.074360
 
-Test 064 fv3_ccpp_gsd_debug PASS
+Test 065 fv3_gsd_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_diag3d_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 065 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd_diag3d_debug
+Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3741,14 +3812,14 @@ Checking test 065 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 225.306297
+The total amount of wall time                        = 224.236854
 
-Test 065 fv3_ccpp_gsd_diag3d_debug PASS
+Test 066 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_thompson_debug_prod
-Checking test 066 fv3_ccpp_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_debug
+Checking test 067 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3812,14 +3883,14 @@ Checking test 066 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 341.836603
+The total amount of wall time                        = 340.075554
 
-Test 066 fv3_ccpp_thompson_debug PASS
+Test 067 fv3_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 067 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_no_aero_debug
+Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3883,14 +3954,14 @@ Checking test 067 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 330.821297
+The total amount of wall time                        = 329.845920
 
-Test 067 fv3_ccpp_thompson_no_aero_debug PASS
+Test 068 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 068 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rrfs_v1beta_debug
+Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3954,14 +4025,14 @@ Checking test 068 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 192.188307
+The total amount of wall time                        = 188.889830
 
-Test 068 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 069 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4025,14 +4096,14 @@ Checking test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 216.395169
+The total amount of wall time                        = 203.934209
 
-Test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 070 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -4046,14 +4117,14 @@ Checking test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 380.092955
+The total amount of wall time                        = 376.024082
 
-Test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 071 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1_debug
+Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -4111,14 +4182,85 @@ Checking test 071 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 579.772698
+The total amount of wall time                        = 606.656985
+
+Test 072 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_ras_debug
+Checking test 073 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 350.677365
 
-Test 071 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 073 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_control_prod
-Checking test 072 cpld_control results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control
+Checking test 074 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4167,14 +4309,14 @@ Checking test 072 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 101.285119
+The total amount of wall time                        = 120.457928
 
-Test 072 cpld_control PASS
+Test 074 cpld_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restart_prod
-Checking test 073 cpld_restart results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart
+Checking test 075 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4223,14 +4365,14 @@ Checking test 073 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 52.005528
+The total amount of wall time                        = 50.718759
 
-Test 073 cpld_restart PASS
+Test 075 cpld_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_controlfrac_prod
-Checking test 074 cpld_controlfrac results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac
+Checking test 076 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4279,14 +4421,14 @@ Checking test 074 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 106.159695
+The total amount of wall time                        = 120.677719
 
-Test 074 cpld_controlfrac PASS
+Test 076 cpld_controlfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restartfrac_prod
-Checking test 075 cpld_restartfrac results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac
+Checking test 077 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4335,14 +4477,14 @@ Checking test 075 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 49.894653
+The total amount of wall time                        = 48.239807
 
-Test 075 cpld_restartfrac PASS
+Test 077 cpld_restartfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_2threads_prod
-Checking test 076 cpld_2threads results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_2threads
+Checking test 078 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4391,14 +4533,14 @@ Checking test 076 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 124.166037
+The total amount of wall time                        = 147.067040
 
-Test 076 cpld_2threads PASS
+Test 078 cpld_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_decomp_prod
-Checking test 077 cpld_decomp results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_decomp
+Checking test 079 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4447,14 +4589,14 @@ Checking test 077 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 122.193962
+The total amount of wall time                        = 90.314914
 
-Test 077 cpld_decomp PASS
+Test 079 cpld_decomp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_satmedmf_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_satmedmf_prod
-Checking test 078 cpld_satmedmf results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_satmedmf
+Checking test 080 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4503,14 +4645,14 @@ Checking test 078 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 96.819726
+The total amount of wall time                        = 91.042473
 
-Test 078 cpld_satmedmf PASS
+Test 080 cpld_satmedmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_ca_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_ca_prod
-Checking test 079 cpld_ca results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_ca
+Checking test 081 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4559,14 +4701,14 @@ Checking test 079 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 95.574276
+The total amount of wall time                        = 121.001866
 
-Test 079 cpld_ca PASS
+Test 081 cpld_ca PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_control_c192_prod
-Checking test 080 cpld_control_c192 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control_c192
+Checking test 082 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4615,14 +4757,14 @@ Checking test 080 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 417.422353
+The total amount of wall time                        = 407.757892
 
-Test 080 cpld_control_c192 PASS
+Test 082 cpld_control_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restart_c192_prod
-Checking test 081 cpld_restart_c192 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_c192
+Checking test 083 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4671,14 +4813,14 @@ Checking test 081 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 284.592658
+The total amount of wall time                        = 307.998223
 
-Test 081 cpld_restart_c192 PASS
+Test 083 cpld_restart_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_controlfrac_c192_prod
-Checking test 082 cpld_controlfrac_c192 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac_c192
+Checking test 084 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4727,14 +4869,14 @@ Checking test 082 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 414.885245
+The total amount of wall time                        = 406.897365
 
-Test 082 cpld_controlfrac_c192 PASS
+Test 084 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restartfrac_c192_prod
-Checking test 083 cpld_restartfrac_c192 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac_c192
+Checking test 085 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4783,14 +4925,14 @@ Checking test 083 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 284.826380
+The total amount of wall time                        = 323.773810
 
-Test 083 cpld_restartfrac_c192 PASS
+Test 085 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_control_c384_prod
-Checking test 084 cpld_control_c384 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control_c384
+Checking test 086 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4842,14 +4984,14 @@ Checking test 084 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1573.722499
+The total amount of wall time                        = 1521.958534
 
-Test 084 cpld_control_c384 PASS
+Test 086 cpld_control_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restart_c384_prod
-Checking test 085 cpld_restart_c384 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_c384
+Checking test 087 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4901,14 +5043,14 @@ Checking test 085 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 787.501707
+The total amount of wall time                        = 773.748556
 
-Test 085 cpld_restart_c384 PASS
+Test 087 cpld_restart_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_controlfrac_c384_prod
-Checking test 086 cpld_controlfrac_c384 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac_c384
+Checking test 088 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4960,14 +5102,14 @@ Checking test 086 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1564.939017
+The total amount of wall time                        = 1532.686150
 
-Test 086 cpld_controlfrac_c384 PASS
+Test 088 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restartfrac_c384_prod
-Checking test 087 cpld_restartfrac_c384 results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac_c384
+Checking test 089 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5019,14 +5161,14 @@ Checking test 087 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 821.304281
+The total amount of wall time                        = 766.519234
 
-Test 087 cpld_restartfrac_c384 PASS
+Test 089 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_bmark_prod
-Checking test 088 cpld_bmark results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_bmark
+Checking test 090 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5078,14 +5220,14 @@ Checking test 088 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 898.267012
+The total amount of wall time                        = 881.501054
 
-Test 088 cpld_bmark PASS
+Test 090 cpld_bmark PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restart_bmark_prod
-Checking test 089 cpld_restart_bmark results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_bmark
+Checking test 091 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5137,14 +5279,14 @@ Checking test 089 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 493.790992
+The total amount of wall time                        = 453.189565
 
-Test 089 cpld_restart_bmark PASS
+Test 091 cpld_restart_bmark PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_bmarkfrac_prod
-Checking test 090 cpld_bmarkfrac results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_bmarkfrac
+Checking test 092 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5196,14 +5338,14 @@ Checking test 090 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 870.568108
+The total amount of wall time                        = 859.231561
 
-Test 090 cpld_bmarkfrac PASS
+Test 092 cpld_bmarkfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_restart_bmarkfrac_prod
-Checking test 091 cpld_restart_bmarkfrac results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_bmarkfrac
+Checking test 093 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5255,14 +5397,14 @@ Checking test 091 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 459.592415
+The total amount of wall time                        = 447.852029
 
-Test 091 cpld_restart_bmarkfrac PASS
+Test 093 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debug_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_debug_prod
-Checking test 092 cpld_debug results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_debug
+Checking test 094 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5311,14 +5453,14 @@ Checking test 092 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 268.650325
+The total amount of wall time                        = 261.103150
 
-Test 092 cpld_debug PASS
+Test 094 cpld_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debugfrac_ccpp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/cpld_debugfrac_prod
-Checking test 093 cpld_debugfrac results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_debugfrac
+Checking test 095 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5367,74 +5509,74 @@ Checking test 093 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 266.272874
+The total amount of wall time                        = 287.770841
 
-Test 093 cpld_debugfrac PASS
+Test 095 cpld_debugfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_control_cfsr
-Checking test 094 datm_control_cfsr results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_control_cfsr
+Checking test 096 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 103.055567
+The total amount of wall time                        = 97.793800
 
-Test 094 datm_control_cfsr PASS
+Test 096 datm_control_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_restart_cfsr
-Checking test 095 datm_restart_cfsr results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_restart_cfsr
+Checking test 097 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 59.947350
+The total amount of wall time                        = 69.735499
 
-Test 095 datm_restart_cfsr PASS
+Test 097 datm_restart_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_control_gefs
-Checking test 096 datm_control_gefs results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_control_gefs
+Checking test 098 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 94.846247
+The total amount of wall time                        = 95.204006
 
-Test 096 datm_control_gefs PASS
+Test 098 datm_control_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_bulk_cfsr
-Checking test 097 datm_bulk_cfsr results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_bulk_cfsr
+Checking test 099 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 98.839096
+The total amount of wall time                        = 114.196027
 
-Test 097 datm_bulk_cfsr PASS
+Test 099 datm_bulk_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_bulk_gefs
-Checking test 098 datm_bulk_gefs results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_bulk_gefs
+Checking test 100 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 95.686765
+The total amount of wall time                        = 94.867519
 
-Test 098 datm_bulk_gefs PASS
+Test 100 datm_bulk_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_mx025_gefs
-Checking test 099 datm_mx025_gefs results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_mx025_gefs
+Checking test 101 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5442,23 +5584,23 @@ Checking test 099 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 403.741743
+The total amount of wall time                        = 386.640594
 
-Test 099 datm_mx025_gefs PASS
+Test 101 datm_mx025_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_debug_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_36347/datm_debug_cfsr
-Checking test 100 datm_debug_cfsr results ....
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
+working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_debug_cfsr
+Checking test 102 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 228.299889
+The total amount of wall time                        = 253.835049
 
-Test 100 datm_debug_cfsr PASS
+Test 102 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 13:04:15 EDT 2021
-Elapsed time: 01h:30m:22s. Have a nice day!
+Wed Mar 17 16:50:27 EDT 2021
+Elapsed time: 01h:17m:29s. Have a nice day!
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
index 231e963d13..d0c0d71d6c 100644
--- a/tests/RegressionTests_hera.gnu.log
+++ b/tests/RegressionTests_hera.gnu.log
@@ -1,10 +1,10 @@
-Mon Mar 15 15:32:14 UTC 2021
+Wed Mar 17 21:02:21 UTC 2021
 Start Regression test
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfdlmp_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfdlmp_prod
-Checking test 001 fv3_ccpp_gfdlmp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfdlmp
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfdlmp
+Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -48,14 +48,14 @@ Checking test 001 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 233.970407
+  0: The total amount of wall time                        = 230.221815
 
-Test 001 fv3_ccpp_gfdlmp PASS
+Test 001 fv3_gfdlmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v15p2_prod
-Checking test 002 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2
+Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -119,14 +119,14 @@ Checking test 002 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 586.511327
+  0: The total amount of wall time                        = 575.623872
 
-Test 002 fv3_ccpp_gfs_v15p2 PASS
+Test 002 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_prod
-Checking test 003 fv3_ccpp_gfs_v16 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16
+Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -202,14 +202,14 @@ Checking test 003 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 597.561812
+  0: The total amount of wall time                        = 599.253044
 
-Test 003 fv3_ccpp_gfs_v16 PASS
+Test 003 fv3_gfs_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_restart_prod
-Checking test 004 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_restart
+Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -255,14 +255,14 @@ Checking test 004 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 291.886595
+  0: The total amount of wall time                        = 298.897952
 
-Test 004 fv3_ccpp_gfs_v16_restart PASS
+Test 004 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_stochy_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 005 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_stochy
+Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -326,14 +326,14 @@ Checking test 005 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 370.489472
+  0: The total amount of wall time                        = 408.934031
 
-Test 005 fv3_ccpp_gfs_v16_stochy PASS
+Test 005 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_flake_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_flake_prod
-Checking test 006 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_flake
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_flake
+Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -397,14 +397,14 @@ Checking test 006 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 579.985304
+  0: The total amount of wall time                        = 651.896884
 
-Test 006 fv3_ccpp_gfs_v16_flake PASS
+Test 006 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_RRTMGP
+Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -468,14 +468,14 @@ Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 685.915855
+  0: The total amount of wall time                        = 718.716919
 
-Test 007 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 008 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_RRTMGP
+Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -539,14 +539,14 @@ Checking test 008 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 700.908666
+  0: The total amount of wall time                        = 743.681647
 
-Test 008 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gsd_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gsd_prod
-Checking test 009 fv3_ccpp_gsd results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gsd
+Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -634,14 +634,14 @@ Checking test 009 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 810.317421
+  0: The total amount of wall time                        = 881.051197
 
-Test 009 fv3_ccpp_gsd PASS
+Test 009 fv3_gsd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_thompson_prod
-Checking test 010 fv3_ccpp_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson
+Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -705,14 +705,14 @@ Checking test 010 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 390.749742
+  0: The total amount of wall time                        = 398.364665
 
-Test 010 fv3_ccpp_thompson PASS
+Test 010 fv3_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_no_aero_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_thompson_no_aero_prod
-Checking test 011 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_no_aero
+Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -776,14 +776,14 @@ Checking test 011 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 380.471711
+  0: The total amount of wall time                        = 399.138654
 
-Test 011 fv3_ccpp_thompson_no_aero PASS
+Test 011 fv3_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_rrfs_v1beta_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_rrfs_v1beta_prod
-Checking test 012 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_rrfs_v1beta
+Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -847,14 +847,14 @@ Checking test 012 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 412.763619
+  0: The total amount of wall time                        = 399.585865
 
-Test 012 fv3_ccpp_rrfs_v1beta PASS
+Test 012 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_HAFS_v0_hwrf_thompson
+Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -918,14 +918,14 @@ Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 607.292609
+  0: The total amount of wall time                        = 628.560364
 
-Test 013 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -939,14 +939,14 @@ Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 449.080236
+ 0: The total amount of wall time                        = 443.604429
 
-Test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 015 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1
+Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1004,14 +1004,14 @@ Checking test 015 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 907.983095
+  0: The total amount of wall time                        = 908.532238
 
-Test 015 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1_warmstart
+Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1069,14 +1069,85 @@ Checking test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 918.404036
+  0: The total amount of wall time                        = 923.398587
 
-Test 016 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_control_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_control_debug_prod
-Checking test 017 fv3_ccpp_control_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_ras
+Checking test 017 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 608.975806
+
+Test 017 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_control_debug
+Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1102,14 +1173,28 @@ Checking test 017 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 84.837095
+  0: The total amount of wall time                        = 88.625162
+
+Test 018 fv3_control_debug PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_regional_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_regional_control_debug
+Checking test 019 fv3_regional_control_debug results ....
+ Comparing atmos_4xdaily.nc .........OK
+ Comparing fv3_history2d.nc .........OK
+ Comparing fv3_history.nc .........OK
+ Comparing RESTART/fv_core.res.tile1_new.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
+
+ 0: The total amount of wall time                        = 168.838854
 
-Test 017 fv3_ccpp_control_debug PASS
+Test 019 fv3_regional_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_rrfs_v1beta_debug
+Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1122,24 +1207,24 @@ Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf006.tile1.nc .........OK
- Comparing phyf006.tile2.nc .........OK
- Comparing phyf006.tile3.nc .........OK
- Comparing phyf006.tile4.nc .........OK
- Comparing phyf006.tile5.nc .........OK
- Comparing phyf006.tile6.nc .........OK
+ Comparing phyf003.tile1.nc .........OK
+ Comparing phyf003.tile2.nc .........OK
+ Comparing phyf003.tile3.nc .........OK
+ Comparing phyf003.tile4.nc .........OK
+ Comparing phyf003.tile5.nc .........OK
+ Comparing phyf003.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf006.tile1.nc .........OK
- Comparing dynf006.tile2.nc .........OK
- Comparing dynf006.tile3.nc .........OK
- Comparing dynf006.tile4.nc .........OK
- Comparing dynf006.tile5.nc .........OK
- Comparing dynf006.tile6.nc .........OK
+ Comparing dynf003.tile1.nc .........OK
+ Comparing dynf003.tile2.nc .........OK
+ Comparing dynf003.tile3.nc .........OK
+ Comparing dynf003.tile4.nc .........OK
+ Comparing dynf003.tile5.nc .........OK
+ Comparing dynf003.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1173,14 +1258,14 @@ Checking test 018 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 271.075533
+  0: The total amount of wall time                        = 120.986153
 
-Test 018 fv3_ccpp_gfs_v15p2_debug PASS
+Test 020 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_debug_prod
-Checking test 019 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gsd_debug
+Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1193,24 +1278,24 @@ Checking test 019 fv3_ccpp_gfs_v16_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf006.tile1.nc .........OK
- Comparing phyf006.tile2.nc .........OK
- Comparing phyf006.tile3.nc .........OK
- Comparing phyf006.tile4.nc .........OK
- Comparing phyf006.tile5.nc .........OK
- Comparing phyf006.tile6.nc .........OK
+ Comparing phyf003.tile1.nc .........OK
+ Comparing phyf003.tile2.nc .........OK
+ Comparing phyf003.tile3.nc .........OK
+ Comparing phyf003.tile4.nc .........OK
+ Comparing phyf003.tile5.nc .........OK
+ Comparing phyf003.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf006.tile1.nc .........OK
- Comparing dynf006.tile2.nc .........OK
- Comparing dynf006.tile3.nc .........OK
- Comparing dynf006.tile4.nc .........OK
- Comparing dynf006.tile5.nc .........OK
- Comparing dynf006.tile6.nc .........OK
+ Comparing dynf003.tile1.nc .........OK
+ Comparing dynf003.tile2.nc .........OK
+ Comparing dynf003.tile3.nc .........OK
+ Comparing dynf003.tile4.nc .........OK
+ Comparing dynf003.tile5.nc .........OK
+ Comparing dynf003.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1244,14 +1329,14 @@ Checking test 019 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 129.496280
+  0: The total amount of wall time                        = 122.324768
 
-Test 019 fv3_ccpp_gfs_v16_debug PASS
+Test 021 fv3_gsd_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_debug
+Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1315,14 +1400,14 @@ Checking test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 318.714050
+  0: The total amount of wall time                        = 203.342459
 
-Test 020 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 022 fv3_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 021 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_no_aero_debug
+Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1386,14 +1471,14 @@ Checking test 021 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 320.059481
+  0: The total amount of wall time                        = 197.439857
 
-Test 021 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 023 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_multigases_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_multigases_prod
-Checking test 022 fv3_ccpp_multigases results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_debug
+Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1456,35 +1541,15 @@ Checking test 022 fv3_ccpp_multigases results ....
  Comparing RESTART/sfc_data.tile4.nc .........OK
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 423.407471
+  0: The total amount of wall time                        = 275.837348
 
-Test 022 fv3_ccpp_multigases PASS
+Test 024 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_regional_control_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_regional_control_debug_prod
-Checking test 023 fv3_ccpp_regional_control_debug results ....
- Comparing atmos_4xdaily.nc .........OK
- Comparing fv3_history2d.nc .........OK
- Comparing fv3_history.nc .........OK
- Comparing RESTART/fv_core.res.tile1_new.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
-
- 0: The total amount of wall time                        = 170.604005
-
-Test 023 fv3_ccpp_regional_control_debug PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_debug
+Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1497,24 +1562,24 @@ Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf003.tile1.nc .........OK
- Comparing phyf003.tile2.nc .........OK
- Comparing phyf003.tile3.nc .........OK
- Comparing phyf003.tile4.nc .........OK
- Comparing phyf003.tile5.nc .........OK
- Comparing phyf003.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf003.tile1.nc .........OK
- Comparing dynf003.tile2.nc .........OK
- Comparing dynf003.tile3.nc .........OK
- Comparing dynf003.tile4.nc .........OK
- Comparing dynf003.tile5.nc .........OK
- Comparing dynf003.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1548,14 +1613,14 @@ Checking test 024 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 117.288385
+  0: The total amount of wall time                        = 132.082633
 
-Test 024 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 025 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_gsd_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gsd_debug_prod
-Checking test 025 fv3_ccpp_gsd_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1568,24 +1633,24 @@ Checking test 025 fv3_ccpp_gsd_debug results ....
  Comparing phyf000.tile4.nc .........OK
  Comparing phyf000.tile5.nc .........OK
  Comparing phyf000.tile6.nc .........OK
- Comparing phyf003.tile1.nc .........OK
- Comparing phyf003.tile2.nc .........OK
- Comparing phyf003.tile3.nc .........OK
- Comparing phyf003.tile4.nc .........OK
- Comparing phyf003.tile5.nc .........OK
- Comparing phyf003.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
  Comparing dynf000.tile1.nc .........OK
  Comparing dynf000.tile2.nc .........OK
  Comparing dynf000.tile3.nc .........OK
  Comparing dynf000.tile4.nc .........OK
  Comparing dynf000.tile5.nc .........OK
  Comparing dynf000.tile6.nc .........OK
- Comparing dynf003.tile1.nc .........OK
- Comparing dynf003.tile2.nc .........OK
- Comparing dynf003.tile3.nc .........OK
- Comparing dynf003.tile4.nc .........OK
- Comparing dynf003.tile5.nc .........OK
- Comparing dynf003.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -1619,14 +1684,14 @@ Checking test 025 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 121.701585
+  0: The total amount of wall time                        = 325.547437
 
-Test 025 fv3_ccpp_gsd_debug PASS
+Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_thompson_debug_prod
-Checking test 026 fv3_ccpp_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_RRTMGP_debug
+Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1690,14 +1755,14 @@ Checking test 026 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 200.074667
+  0: The total amount of wall time                        = 311.887452
 
-Test 026 fv3_ccpp_thompson_debug PASS
+Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_thompson_no_aero_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 027 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_multigases
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_multigases
+Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1760,15 +1825,21 @@ Checking test 027 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile4.nc .........OK
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 191.013240
+  0: The total amount of wall time                        = 441.145451
 
-Test 027 fv3_ccpp_thompson_no_aero_debug PASS
+Test 028 fv3_multigases PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1832,14 +1903,14 @@ Checking test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 134.187735
+  0: The total amount of wall time                        = 133.935288
 
-Test 028 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -1853,14 +1924,14 @@ Checking test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 221.463238
+ 0: The total amount of wall time                        = 224.800982
 
-Test 029 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/GNU/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_267572/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 030 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1_debug
+Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -1918,11 +1989,82 @@ Checking test 030 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 386.492332
+  0: The total amount of wall time                        = 391.575539
+
+Test 031 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_ras_debug
+Checking test 032 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc ............SKIP for gnu compilers
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 219.115575
 
-Test 030 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 16:09:07 UTC 2021
-Elapsed time: 00h:36m:54s. Have a nice day!
+Wed Mar 17 21:28:59 UTC 2021
+Elapsed time: 00h:26m:39s. Have a nice day!
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
index 4c261b300b..eeb5727b00 100644
--- a/tests/RegressionTests_hera.intel.log
+++ b/tests/RegressionTests_hera.intel.log
@@ -1,10 +1,10 @@
-Mon Mar 15 15:46:28 UTC 2021
+Wed Mar 17 20:53:57 UTC 2021
 Start Regression test
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +68,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 39.820948
+  0: The total amount of wall time                        = 39.984777
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_decomp_prod
-Checking test 002 fv3_ccpp_decomp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_decomp
+Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +139,14 @@ Checking test 002 fv3_ccpp_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 41.696005
+  0: The total amount of wall time                        = 40.778737
 
-Test 002 fv3_ccpp_decomp PASS
+Test 002 fv3_decomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_2threads_prod
-Checking test 003 fv3_ccpp_2threads results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_2threads
+Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -210,14 +210,14 @@ Checking test 003 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 41.704694
+ 0: The total amount of wall time                        = 41.434267
 
-Test 003 fv3_ccpp_2threads PASS
+Test 003 fv3_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_restart_prod
-Checking test 004 fv3_ccpp_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_restart
+Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -263,14 +263,14 @@ Checking test 004 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 18.894438
+  0: The total amount of wall time                        = 18.898729
 
-Test 004 fv3_ccpp_restart PASS
+Test 004 fv3_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_read_inc_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_read_inc_prod
-Checking test 005 fv3_ccpp_read_inc results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_read_inc
+Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -334,14 +334,14 @@ Checking test 005 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.373933
+  0: The total amount of wall time                        = 36.456500
 
-Test 005 fv3_ccpp_read_inc PASS
+Test 005 fv3_read_inc PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf_esmf
+Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -385,14 +385,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 118.985372
+  0: The total amount of wall time                        = 111.429769
 
-Test 006 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf
+Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -436,14 +436,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 38.453367
+  0: The total amount of wall time                        = 38.158742
 
-Test 007 fv3_ccpp_wrtGauss_netcdf PASS
+Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf_parallel
+Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -487,14 +487,14 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.808920
+  0: The total amount of wall time                        = 48.224545
 
-Test 008 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGlatlon_netcdf
+Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -538,14 +538,14 @@ Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 38.531347
+  0: The total amount of wall time                        = 37.504070
 
-Test 009 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio
+Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -589,14 +589,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 37.806432
+  0: The total amount of wall time                        = 36.951184
 
-Test 010 fv3_ccpp_wrtGauss_nemsio PASS
+Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio_c192
+Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +640,14 @@ Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 95.943929
+  0: The total amount of wall time                        = 95.861372
 
-Test 011 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stochy_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_stochy_prod
-Checking test 012 fv3_ccpp_stochy results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stochy
+Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +711,14 @@ Checking test 012 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 41.394106
+  0: The total amount of wall time                        = 41.037955
 
-Test 012 fv3_ccpp_stochy PASS
+Test 012 fv3_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ca_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_ca_prod
-Checking test 013 fv3_ccpp_ca results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_ca
+Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +782,14 @@ Checking test 013 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 27.442370
+  0: The total amount of wall time                        = 26.848782
 
-Test 013 fv3_ccpp_ca PASS
+Test 013 fv3_ca PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lndp_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_lndp_prod
-Checking test 014 fv3_ccpp_lndp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_lndp
+Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +853,14 @@ Checking test 014 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.327471
+  0: The total amount of wall time                        = 43.912846
 
-Test 014 fv3_ccpp_lndp PASS
+Test 014 fv3_lndp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_iau_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_iau_prod
-Checking test 015 fv3_ccpp_iau results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_iau
+Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -924,14 +924,14 @@ Checking test 015 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.161476
+  0: The total amount of wall time                        = 36.950534
 
-Test 015 fv3_ccpp_iau PASS
+Test 015 fv3_iau PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lheatstrg_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_lheatstrg_prod
-Checking test 016 fv3_ccpp_lheatstrg results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_lheatstrg
+Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -975,14 +975,14 @@ Checking test 016 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.584574
+  0: The total amount of wall time                        = 36.682170
 
-Test 016 fv3_ccpp_lheatstrg PASS
+Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmprad_prod
-Checking test 017 fv3_ccpp_gfdlmprad results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad
+Checking test 017 fv3_gfdlmprad results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1027,14 +1027,14 @@ Checking test 017 fv3_ccpp_gfdlmprad results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 650.226553
+  0: The total amount of wall time                        = 647.779269
 
-Test 017 fv3_ccpp_gfdlmprad PASS
+Test 017 fv3_gfdlmprad PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_atmwav_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmprad_atmwav_prod
-Checking test 018 fv3_ccpp_gfdlmprad_atmwav results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_atmwav
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_atmwav
+Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1079,14 +1079,14 @@ Checking test 018 fv3_ccpp_gfdlmprad_atmwav results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 794.057355
+  0: The total amount of wall time                        = 795.365042
 
-Test 018 fv3_ccpp_gfdlmprad_atmwav PASS
+Test 018 fv3_gfdlmprad_atmwav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c768_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_wrtGauss_nemsio_c768_prod
-Checking test 019 fv3_ccpp_wrtGauss_nemsio_c768 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c768
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio_c768
+Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1131,14 +1131,14 @@ Checking test 019 fv3_ccpp_wrtGauss_nemsio_c768 results ....
  Comparing out_grd.ant_9km .........OK
  Comparing out_grd.aoc_9km .........OK
 
-   0: The total amount of wall time                        = 670.292633
+   0: The total amount of wall time                        = 674.318096
 
-Test 019 fv3_ccpp_wrtGauss_nemsio_c768 PASS
+Test 019 fv3_wrtGauss_nemsio_c768 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_multigases_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_multigases_prod
-Checking test 020 fv3_ccpp_multigases results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_multigases_repro
+Checking test 020 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1208,14 +1208,14 @@ Checking test 020 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 75.720520
+  0: The total amount of wall time                        = 94.344276
 
-Test 020 fv3_ccpp_multigases PASS
+Test 020 fv3_multigases PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_32bit_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_control_32bit_prod
-Checking test 021 fv3_ccpp_control_32bit results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control_32bit
+Checking test 021 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1279,14 +1279,14 @@ Checking test 021 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.119760
+  0: The total amount of wall time                        = 37.402951
 
-Test 021 fv3_ccpp_control_32bit PASS
+Test 021 fv3_control_32bit PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_stretched_prod
-Checking test 022 fv3_ccpp_stretched results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched
+Checking test 022 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1338,14 +1338,14 @@ Checking test 022 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 218.355337
+ 0: The total amount of wall time                        = 225.504355
 
-Test 022 fv3_ccpp_stretched PASS
+Test 022 fv3_stretched PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_stretched_nest_prod
-Checking test 023 fv3_ccpp_stretched_nest results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched_nest
+Checking test 023 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1408,40 +1408,40 @@ Checking test 023 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
- 0: The total amount of wall time                        = 241.797501
+ 0: The total amount of wall time                        = 236.955976
 
-Test 023 fv3_ccpp_stretched_nest PASS
+Test 023 fv3_stretched_nest PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_control_prod
-Checking test 024 fv3_ccpp_regional_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_control
+Checking test 024 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 538.287428
+ 0: The total amount of wall time                        = 546.765215
 
-Test 024 fv3_ccpp_regional_control PASS
+Test 024 fv3_regional_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_restart_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_restart_prod
-Checking test 025 fv3_ccpp_regional_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_restart
+Checking test 025 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
- 0: The total amount of wall time                        = 299.440706
+ 0: The total amount of wall time                        = 302.067242
 
-Test 025 fv3_ccpp_regional_restart PASS
+Test 025 fv3_regional_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_quilt_prod
-Checking test 026 fv3_ccpp_regional_quilt results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt
+Checking test 026 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1451,14 +1451,14 @@ Checking test 026 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 574.471287
+ 0: The total amount of wall time                        = 574.553838
 
-Test 026 fv3_ccpp_regional_quilt PASS
+Test 026 fv3_regional_quilt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_hafs_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 027 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt_hafs
+Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1466,28 +1466,28 @@ Checking test 027 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 569.850052
+ 0: The total amount of wall time                        = 574.746857
 
-Test 027 fv3_ccpp_regional_quilt_hafs PASS
+Test 027 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 028 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt_netcdf_parallel
+Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc ............ALT CHECK......OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 574.410244
+ 0: The total amount of wall time                        = 573.410316
 
-Test 028 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 028 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmp_prod
-Checking test 029 fv3_ccpp_gfdlmp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmp
+Checking test 029 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1531,14 +1531,14 @@ Checking test 029 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.512034
+  0: The total amount of wall time                        = 42.617745
 
-Test 029 fv3_ccpp_gfdlmp PASS
+Test 029 fv3_gfdlmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_gwd_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 030 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_gwd
+Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1582,14 +1582,14 @@ Checking test 030 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.662451
+  0: The total amount of wall time                        = 42.644786
 
-Test 030 fv3_ccpp_gfdlmprad_gwd PASS
+Test 030 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 031 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_noahmp
+Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1633,14 +1633,14 @@ Checking test 031 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.493438
+  0: The total amount of wall time                        = 42.722683
 
-Test 031 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 031 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_csawmg_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_csawmg_prod
-Checking test 032 fv3_ccpp_csawmg results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_csawmg
+Checking test 032 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1684,14 +1684,14 @@ Checking test 032 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 108.002941
+  0: The total amount of wall time                        = 107.398435
 
-Test 032 fv3_ccpp_csawmg PASS
+Test 032 fv3_csawmg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmf_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_satmedmf_prod
-Checking test 033 fv3_ccpp_satmedmf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_satmedmf
+Checking test 033 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1735,14 +1735,14 @@ Checking test 033 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.081347
+  0: The total amount of wall time                        = 45.666010
 
-Test 033 fv3_ccpp_satmedmf PASS
+Test 033 fv3_satmedmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmfq_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_satmedmfq_prod
-Checking test 034 fv3_ccpp_satmedmfq results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_satmedmfq
+Checking test 034 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1786,14 +1786,14 @@ Checking test 034 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 44.823135
+  0: The total amount of wall time                        = 45.544278
 
-Test 034 fv3_ccpp_satmedmfq PASS
+Test 034 fv3_satmedmfq PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_32bit_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 035 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmp_32bit
+Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1837,14 +1837,14 @@ Checking test 035 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.315722
+  0: The total amount of wall time                        = 40.948125
 
-Test 035 fv3_ccpp_gfdlmp_32bit PASS
+Test 035 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 036 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_32bit_post
+Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1892,14 +1892,14 @@ Checking test 036 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 74.857665
+  0: The total amount of wall time                        = 74.076119
 
-Test 036 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 036 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_cpt_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_cpt_prod
-Checking test 037 fv3_ccpp_cpt results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_cpt
+Checking test 037 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1949,14 +1949,14 @@ Checking test 037 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 256.721063
+  0: The total amount of wall time                        = 252.570449
 
-Test 037 fv3_ccpp_cpt PASS
+Test 037 fv3_cpt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gsd_prod
-Checking test 038 fv3_ccpp_gsd results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd
+Checking test 038 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2044,14 +2044,14 @@ Checking test 038 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 176.998657
+  0: The total amount of wall time                        = 177.306962
 
-Test 038 fv3_ccpp_gsd PASS
+Test 038 fv3_gsd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rap_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_rap_prod
-Checking test 039 fv3_ccpp_rap results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rap
+Checking test 039 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2115,14 +2115,14 @@ Checking test 039 fv3_ccpp_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 86.539870
+  0: The total amount of wall time                        = 87.164614
 
-Test 039 fv3_ccpp_rap PASS
+Test 039 fv3_rap PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_hrrr_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_hrrr_prod
-Checking test 040 fv3_ccpp_hrrr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_hrrr
+Checking test 040 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2186,14 +2186,14 @@ Checking test 040 fv3_ccpp_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 94.950462
+  0: The total amount of wall time                        = 95.376886
 
-Test 040 fv3_ccpp_hrrr PASS
+Test 040 fv3_hrrr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_thompson_prod
-Checking test 041 fv3_ccpp_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson
+Checking test 041 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2257,14 +2257,14 @@ Checking test 041 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 83.883970
+  0: The total amount of wall time                        = 83.532451
 
-Test 041 fv3_ccpp_thompson PASS
+Test 041 fv3_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_thompson_no_aero_prod
-Checking test 042 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_no_aero
+Checking test 042 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2328,14 +2328,14 @@ Checking test 042 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 78.864208
+  0: The total amount of wall time                        = 79.108371
 
-Test 042 fv3_ccpp_thompson_no_aero PASS
+Test 042 fv3_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_rrfs_v1beta_prod
-Checking test 043 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rrfs_v1beta
+Checking test 043 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2399,14 +2399,14 @@ Checking test 043 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 97.051378
+  0: The total amount of wall time                        = 97.567700
 
-Test 043 fv3_ccpp_rrfs_v1beta PASS
+Test 043 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v15p2_prod
-Checking test 044 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2
+Checking test 044 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2470,14 +2470,14 @@ Checking test 044 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 92.268968
+  0: The total amount of wall time                        = 91.850977
 
-Test 044 fv3_ccpp_gfs_v15p2 PASS
+Test 044 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_prod
-Checking test 045 fv3_ccpp_gfs_v16 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16
+Checking test 045 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2553,14 +2553,14 @@ Checking test 045 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 103.291199
+  0: The total amount of wall time                        = 102.515385
 
-Test 045 fv3_ccpp_gfs_v16 PASS
+Test 045 fv3_gfs_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_restart_prod
-Checking test 046 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_restart
+Checking test 046 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2606,14 +2606,14 @@ Checking test 046 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 52.978843
+  0: The total amount of wall time                        = 53.055160
 
-Test 046 fv3_ccpp_gfs_v16_restart PASS
+Test 046 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_stochy_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 047 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_stochy
+Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2677,14 +2677,14 @@ Checking test 047 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.704682
+  0: The total amount of wall time                        = 47.100106
 
-Test 047 fv3_ccpp_gfs_v16_stochy PASS
+Test 047 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 048 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_RRTMGP
+Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2748,14 +2748,14 @@ Checking test 048 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 154.916247
+  0: The total amount of wall time                        = 153.246460
 
-Test 048 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 048 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 049 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP
+Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2819,14 +2819,14 @@ Checking test 049 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 163.209395
+  0: The total amount of wall time                        = 156.436174
 
-Test 049 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 049 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2884,14 +2884,14 @@ Checking test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 635.194443
+  0: The total amount of wall time                        = 624.869992
 
-Test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 050 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2955,14 +2955,14 @@ Checking test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 169.926189
+ 0: The total amount of wall time                        = 175.662028
 
-Test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 051 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmg_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfsv16_csawmg_prod
-Checking test 052 fv3_ccpp_gfsv16_csawmg results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_csawmg
+Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3006,14 +3006,14 @@ Checking test 052 fv3_ccpp_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 116.387435
+  0: The total amount of wall time                        = 114.438854
 
-Test 052 fv3_ccpp_gfsv16_csawmg PASS
+Test 052 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmgt_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfsv16_csawmgt_prod
-Checking test 053 fv3_ccpp_gfsv16_csawmgt results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_csawmgt
+Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3057,14 +3057,14 @@ Checking test 053 fv3_ccpp_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 114.610591
+  0: The total amount of wall time                        = 112.480343
 
-Test 053 fv3_ccpp_gfsv16_csawmgt PASS
+Test 053 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gocart_clm_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gocart_clm_prod
-Checking test 054 fv3_ccpp_gocart_clm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gocart_clm
+Checking test 054 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3108,14 +3108,14 @@ Checking test 054 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.833943
+  0: The total amount of wall time                        = 46.884791
 
-Test 054 fv3_ccpp_gocart_clm PASS
+Test 054 fv3_gocart_clm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_flake_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_flake_prod
-Checking test 055 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_flake
+Checking test 055 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3179,14 +3179,14 @@ Checking test 055 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 94.028350
+  0: The total amount of wall time                        = 94.609762
 
-Test 055 fv3_ccpp_gfs_v16_flake PASS
+Test 055 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 056 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_HAFS_v0_hwrf_thompson
+Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3250,14 +3250,14 @@ Checking test 056 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 141.391373
+  0: The total amount of wall time                        = 141.396630
 
-Test 056 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 056 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -3271,14 +3271,14 @@ Checking test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 280.893582
+ 0: The total amount of wall time                        = 280.570341
 
-Test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 057 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 058 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1
+Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3336,14 +3336,14 @@ Checking test 058 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 163.002475
+  0: The total amount of wall time                        = 163.168728
 
-Test 058 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 058 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1_warmstart
+Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3401,14 +3401,85 @@ Checking test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 162.308474
+  0: The total amount of wall time                        = 164.991385
 
-Test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 059 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 060 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_ras
+Checking test 060 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 88.093064
+
+Test 060 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_debug
+Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3472,14 +3543,14 @@ Checking test 060 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 226.913909
+  0: The total amount of wall time                        = 227.023364
 
-Test 060 fv3_ccpp_gfs_v15p2_debug PASS
+Test 061 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_debug_prod
-Checking test 061 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_debug
+Checking test 062 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3543,14 +3614,14 @@ Checking test 061 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 173.863329
+  0: The total amount of wall time                        = 170.542628
 
-Test 061 fv3_ccpp_gfs_v16_debug PASS
+Test 062 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3614,14 +3685,14 @@ Checking test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 345.255492
+  0: The total amount of wall time                        = 343.080931
 
-Test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 063 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 063 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_debug
+Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3685,28 +3756,28 @@ Checking test 063 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 356.023037
+  0: The total amount of wall time                        = 350.730465
 
-Test 063 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 064 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_regional_control_debug_prod
-Checking test 064 fv3_ccpp_regional_control_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_control_debug
+Checking test 065 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 346.152073
+ 0: The total amount of wall time                        = 343.648586
 
-Test 064 fv3_ccpp_regional_control_debug PASS
+Test 065 fv3_regional_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_control_debug_prod
-Checking test 065 fv3_ccpp_control_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control_debug
+Checking test 066 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3732,14 +3803,14 @@ Checking test 065 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 131.753745
+  0: The total amount of wall time                        = 131.367273
 
-Test 065 fv3_ccpp_control_debug PASS
+Test 066 fv3_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_stretched_nest_debug_prod
-Checking test 066 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched_nest_debug
+Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3755,14 +3826,14 @@ Checking test 066 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 353.092963
+ 0: The total amount of wall time                        = 353.115307
 
-Test 066 fv3_ccpp_stretched_nest_debug PASS
+Test 067 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gsd_debug_prod
-Checking test 067 fv3_ccpp_gsd_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd_debug
+Checking test 068 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3826,14 +3897,14 @@ Checking test 067 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 202.644216
+  0: The total amount of wall time                        = 198.377431
 
-Test 067 fv3_ccpp_gsd_debug PASS
+Test 068 fv3_gsd_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_diag3d_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 068 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd_diag3d_debug
+Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3897,14 +3968,14 @@ Checking test 068 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 262.831129
+  0: The total amount of wall time                        = 250.833859
 
-Test 068 fv3_ccpp_gsd_diag3d_debug PASS
+Test 069 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_thompson_debug_prod
-Checking test 069 fv3_ccpp_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_debug
+Checking test 070 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3968,14 +4039,14 @@ Checking test 069 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 330.254832
+  0: The total amount of wall time                        = 328.146694
 
-Test 069 fv3_ccpp_thompson_debug PASS
+Test 070 fv3_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 070 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_no_aero_debug
+Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4039,14 +4110,14 @@ Checking test 070 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 313.972837
+  0: The total amount of wall time                        = 316.827349
 
-Test 070 fv3_ccpp_thompson_no_aero_debug PASS
+Test 071 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 071 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rrfs_v1beta_debug
+Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4110,14 +4181,14 @@ Checking test 071 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 194.159450
+  0: The total amount of wall time                        = 189.821750
 
-Test 071 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 072 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4181,14 +4252,14 @@ Checking test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 204.837334
+  0: The total amount of wall time                        = 201.618230
 
-Test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 073 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -4202,14 +4273,14 @@ Checking test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 384.302992
+ 0: The total amount of wall time                        = 374.293835
 
-Test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 074 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1_debug
+Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -4267,14 +4338,85 @@ Checking test 074 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 549.493664
+  0: The total amount of wall time                        = 542.635850
+
+Test 075 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_ras_debug
+Checking test 076 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 309.132295
 
-Test 074 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 076 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_control_prod
-Checking test 075 cpld_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control
+Checking test 077 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4323,14 +4465,14 @@ Checking test 075 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 90.101533
+  0: The total amount of wall time                        = 90.339128
 
-Test 075 cpld_control PASS
+Test 077 cpld_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_prod
-Checking test 076 cpld_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart
+Checking test 078 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4379,14 +4521,14 @@ Checking test 076 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 55.423159
+  0: The total amount of wall time                        = 54.768869
 
-Test 076 cpld_restart PASS
+Test 078 cpld_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_controlfrac_prod
-Checking test 077 cpld_controlfrac results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac
+Checking test 079 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4435,14 +4577,14 @@ Checking test 077 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 90.707759
+  0: The total amount of wall time                        = 95.907851
 
-Test 077 cpld_controlfrac PASS
+Test 079 cpld_controlfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restartfrac_prod
-Checking test 078 cpld_restartfrac results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac
+Checking test 080 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4491,14 +4633,14 @@ Checking test 078 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 55.579114
+  0: The total amount of wall time                        = 55.511067
 
-Test 078 cpld_restartfrac PASS
+Test 080 cpld_restartfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_2threads_prod
-Checking test 079 cpld_2threads results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_2threads
+Checking test 081 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4547,14 +4689,14 @@ Checking test 079 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 110.233780
+  0: The total amount of wall time                        = 110.409809
 
-Test 079 cpld_2threads PASS
+Test 081 cpld_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_decomp_prod
-Checking test 080 cpld_decomp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_decomp
+Checking test 082 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4603,14 +4745,14 @@ Checking test 080 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 87.807401
+  0: The total amount of wall time                        = 88.728218
 
-Test 080 cpld_decomp PASS
+Test 082 cpld_decomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_satmedmf_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_satmedmf_prod
-Checking test 081 cpld_satmedmf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_satmedmf
+Checking test 083 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4659,14 +4801,14 @@ Checking test 081 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 86.781482
+  0: The total amount of wall time                        = 87.231026
 
-Test 081 cpld_satmedmf PASS
+Test 083 cpld_satmedmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_ca_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_ca_prod
-Checking test 082 cpld_ca results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_ca
+Checking test 084 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4715,14 +4857,14 @@ Checking test 082 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 88.532365
+  0: The total amount of wall time                        = 87.981922
 
-Test 082 cpld_ca PASS
+Test 084 cpld_ca PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_control_c192_prod
-Checking test 083 cpld_control_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_c192
+Checking test 085 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4771,14 +4913,14 @@ Checking test 083 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 375.899109
+  0: The total amount of wall time                        = 375.367746
 
-Test 083 cpld_control_c192 PASS
+Test 085 cpld_control_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_c192_prod
-Checking test 084 cpld_restart_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_c192
+Checking test 086 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4827,14 +4969,14 @@ Checking test 084 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 271.862402
+  0: The total amount of wall time                        = 270.814211
 
-Test 084 cpld_restart_c192 PASS
+Test 086 cpld_restart_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_controlfrac_c192_prod
-Checking test 085 cpld_controlfrac_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac_c192
+Checking test 087 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4883,14 +5025,14 @@ Checking test 085 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 373.801676
+  0: The total amount of wall time                        = 373.279468
 
-Test 085 cpld_controlfrac_c192 PASS
+Test 087 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restartfrac_c192_prod
-Checking test 086 cpld_restartfrac_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac_c192
+Checking test 088 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4939,14 +5081,14 @@ Checking test 086 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 271.784243
+  0: The total amount of wall time                        = 266.135016
 
-Test 086 cpld_restartfrac_c192 PASS
+Test 088 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_control_c384_prod
-Checking test 087 cpld_control_c384 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_c384
+Checking test 089 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4998,14 +5140,14 @@ Checking test 087 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1319.686156
+  0: The total amount of wall time                        = 1329.110627
 
-Test 087 cpld_control_c384 PASS
+Test 089 cpld_control_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_c384_prod
-Checking test 088 cpld_restart_c384 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_c384
+Checking test 090 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5057,14 +5199,14 @@ Checking test 088 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 695.474549
+  0: The total amount of wall time                        = 696.887685
 
-Test 088 cpld_restart_c384 PASS
+Test 090 cpld_restart_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_controlfrac_c384_prod
-Checking test 089 cpld_controlfrac_c384 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac_c384
+Checking test 091 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5116,14 +5258,14 @@ Checking test 089 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1320.686769
+  0: The total amount of wall time                        = 1312.699512
 
-Test 089 cpld_controlfrac_c384 PASS
+Test 091 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restartfrac_c384_prod
-Checking test 090 cpld_restartfrac_c384 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac_c384
+Checking test 092 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5175,14 +5317,14 @@ Checking test 090 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 688.747277
+  0: The total amount of wall time                        = 695.786189
 
-Test 090 cpld_restartfrac_c384 PASS
+Test 092 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmark_prod
-Checking test 091 cpld_bmark results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmark
+Checking test 093 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5234,14 +5376,14 @@ Checking test 091 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 819.239022
+  0: The total amount of wall time                        = 822.009683
 
-Test 091 cpld_bmark PASS
+Test 093 cpld_bmark PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_bmark_prod
-Checking test 092 cpld_restart_bmark results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmark
+Checking test 094 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5293,14 +5435,14 @@ Checking test 092 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 453.508104
+  0: The total amount of wall time                        = 455.656186
 
-Test 092 cpld_restart_bmark PASS
+Test 094 cpld_restart_bmark PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmarkfrac_prod
-Checking test 093 cpld_bmarkfrac results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac
+Checking test 095 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5352,14 +5494,14 @@ Checking test 093 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 818.880256
+  0: The total amount of wall time                        = 819.301220
 
-Test 093 cpld_bmarkfrac PASS
+Test 095 cpld_bmarkfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_bmarkfrac_prod
-Checking test 094 cpld_restart_bmarkfrac results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmarkfrac
+Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5411,14 +5553,14 @@ Checking test 094 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 440.989959
+  0: The total amount of wall time                        = 450.464189
 
-Test 094 cpld_restart_bmarkfrac PASS
+Test 096 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmarkfrac_v16_prod
-Checking test 095 cpld_bmarkfrac_v16 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_v16
+Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5470,14 +5612,14 @@ Checking test 095 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 1323.191829
+  0: The total amount of wall time                        = 1305.824498
 
-Test 095 cpld_bmarkfrac_v16 PASS
+Test 097 cpld_bmarkfrac_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_restart_bmarkfrac_v16_prod
-Checking test 096 cpld_restart_bmarkfrac_v16 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmarkfrac_v16
+Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5529,14 +5671,14 @@ Checking test 096 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 729.645432
+  0: The total amount of wall time                        = 736.928195
 
-Test 096 cpld_restart_bmarkfrac_v16 PASS
+Test 098 cpld_restart_bmarkfrac_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_wave_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmark_wave_prod
-Checking test 097 cpld_bmark_wave results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark_wave
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmark_wave
+Checking test 099 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5591,14 +5733,14 @@ Checking test 097 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1366.430816
+  0: The total amount of wall time                        = 1371.881760
 
-Test 097 cpld_bmark_wave PASS
+Test 099 cpld_bmark_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmarkfrac_wave_prod
-Checking test 098 cpld_bmarkfrac_wave results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_wave
+Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5653,14 +5795,14 @@ Checking test 098 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1365.825424
+  0: The total amount of wall time                        = 1367.920208
 
-Test 098 cpld_bmarkfrac_wave PASS
+Test 100 cpld_bmarkfrac_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_v16_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_bmarkfrac_wave_v16_prod
-Checking test 099 cpld_bmarkfrac_wave_v16 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave_v16
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_wave_v16
+Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5714,14 +5856,14 @@ Checking test 099 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 900.440136
+  0: The total amount of wall time                        = 905.989112
 
-Test 099 cpld_bmarkfrac_wave_v16 PASS
+Test 101 cpld_bmarkfrac_wave_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_wave_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_control_wave_prod
-Checking test 100 cpld_control_wave results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_wave
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_wave
+Checking test 102 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5773,14 +5915,14 @@ Checking test 100 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 788.579555
+  0: The total amount of wall time                        = 781.782198
 
-Test 100 cpld_control_wave PASS
+Test 102 cpld_control_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debug_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_debug_prod
-Checking test 101 cpld_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_debug
+Checking test 103 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5829,14 +5971,14 @@ Checking test 101 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 291.535966
+  0: The total amount of wall time                        = 288.146012
 
-Test 101 cpld_debug PASS
+Test 103 cpld_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debugfrac_ccpp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/cpld_debugfrac_prod
-Checking test 102 cpld_debugfrac results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_debugfrac
+Checking test 104 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5885,74 +6027,74 @@ Checking test 102 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 290.223750
+  0: The total amount of wall time                        = 290.711654
 
-Test 102 cpld_debugfrac PASS
+Test 104 cpld_debugfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_control_cfsr
-Checking test 103 datm_control_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_control_cfsr
+Checking test 105 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 95.380910
+  0: The total amount of wall time                        = 99.712761
 
-Test 103 datm_control_cfsr PASS
+Test 105 datm_control_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_restart_cfsr
-Checking test 104 datm_restart_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_restart_cfsr
+Checking test 106 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 61.520902
+  0: The total amount of wall time                        = 60.478684
 
-Test 104 datm_restart_cfsr PASS
+Test 106 datm_restart_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_control_gefs
-Checking test 105 datm_control_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_control_gefs
+Checking test 107 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 87.965986
+  0: The total amount of wall time                        = 89.962727
 
-Test 105 datm_control_gefs PASS
+Test 107 datm_control_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_bulk_cfsr
-Checking test 106 datm_bulk_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_bulk_cfsr
+Checking test 108 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 90.934683
+  0: The total amount of wall time                        = 94.244593
 
-Test 106 datm_bulk_cfsr PASS
+Test 108 datm_bulk_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_bulk_gefs
-Checking test 107 datm_bulk_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_bulk_gefs
+Checking test 109 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 88.832563
+  0: The total amount of wall time                        = 92.172983
 
-Test 107 datm_bulk_gefs PASS
+Test 109 datm_bulk_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_mx025_cfsr
-Checking test 108 datm_mx025_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_mx025_cfsr
+Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5960,14 +6102,14 @@ Checking test 108 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 359.304711
+  0: The total amount of wall time                        = 366.399041
 
-Test 108 datm_mx025_cfsr PASS
+Test 110 datm_mx025_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_mx025_gefs
-Checking test 109 datm_mx025_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_mx025_gefs
+Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5975,23 +6117,23 @@ Checking test 109 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 357.808078
+  0: The total amount of wall time                        = 357.507390
 
-Test 109 datm_mx025_gefs PASS
+Test 111 datm_mx025_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_debug_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_53934/datm_debug_cfsr
-Checking test 110 datm_debug_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_debug_cfsr
+Checking test 112 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 267.113286
+  0: The total amount of wall time                        = 265.079234
 
-Test 110 datm_debug_cfsr PASS
+Test 112 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 17:16:13 UTC 2021
-Elapsed time: 01h:29m:46s. Have a nice day!
+Wed Mar 17 22:25:38 UTC 2021
+Elapsed time: 01h:31m:42s. Have a nice day!
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
index d3fabe05ca..d21bbca020 100644
--- a/tests/RegressionTests_jet.intel.log
+++ b/tests/RegressionTests_jet.intel.log
@@ -1,10 +1,10 @@
-Mon Mar 15 15:31:15 GMT 2021
+Wed Mar 17 19:33:34 GMT 2021
 Start Regression test
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +68,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.812134
+The total amount of wall time                        = 59.019073
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_2threads_prod
-Checking test 002 fv3_ccpp_2threads results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_2threads
+Checking test 002 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +139,14 @@ Checking test 002 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 281.513271
+The total amount of wall time                        = 291.380542
 
-Test 002 fv3_ccpp_2threads PASS
+Test 002 fv3_2threads PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_restart_prod
-Checking test 003 fv3_ccpp_restart results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_restart
+Checking test 003 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -192,14 +192,14 @@ Checking test 003 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 27.429526
+The total amount of wall time                        = 27.673882
 
-Test 003 fv3_ccpp_restart PASS
+Test 003 fv3_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_read_inc_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_read_inc_prod
-Checking test 004 fv3_ccpp_read_inc results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_read_inc
+Checking test 004 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -263,14 +263,14 @@ Checking test 004 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.492872
+The total amount of wall time                        = 52.907264
 
-Test 004 fv3_ccpp_read_inc PASS
+Test 004 fv3_read_inc PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 005 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf_esmf
+Checking test 005 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -314,14 +314,14 @@ Checking test 005 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 153.693164
+The total amount of wall time                        = 156.743211
 
-Test 005 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 005 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf
+Checking test 006 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -365,14 +365,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.510003
+The total amount of wall time                        = 52.684815
 
-Test 006 fv3_ccpp_wrtGauss_netcdf PASS
+Test 006 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf_parallel
+Checking test 007 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -416,14 +416,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 71.922677
+The total amount of wall time                        = 68.053817
 
-Test 007 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 007 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 008 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGlatlon_netcdf
+Checking test 008 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -467,14 +467,14 @@ Checking test 008 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.692752
+The total amount of wall time                        = 52.984470
 
-Test 008 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 008 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 009 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_nemsio
+Checking test 009 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -518,14 +518,14 @@ Checking test 009 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.411888
+The total amount of wall time                        = 52.310479
 
-Test 009 fv3_ccpp_wrtGauss_nemsio PASS
+Test 009 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_nemsio_c192
+Checking test 010 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -569,14 +569,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 141.282702
+The total amount of wall time                        = 140.905612
 
-Test 010 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 010 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stochy_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_stochy_prod
-Checking test 011 fv3_ccpp_stochy results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stochy
+Checking test 011 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +640,14 @@ Checking test 011 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.295106
+The total amount of wall time                        = 58.977465
 
-Test 011 fv3_ccpp_stochy PASS
+Test 011 fv3_stochy PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ca_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_ca_prod
-Checking test 012 fv3_ccpp_ca results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_ca
+Checking test 012 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +711,14 @@ Checking test 012 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 41.881267
+The total amount of wall time                        = 45.157381
 
-Test 012 fv3_ccpp_ca PASS
+Test 012 fv3_ca PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lndp_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_lndp_prod
-Checking test 013 fv3_ccpp_lndp results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_lndp
+Checking test 013 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +782,14 @@ Checking test 013 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.033832
+The total amount of wall time                        = 66.065248
 
-Test 013 fv3_ccpp_lndp PASS
+Test 013 fv3_lndp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_iau_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_iau_prod
-Checking test 014 fv3_ccpp_iau results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_iau
+Checking test 014 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +853,14 @@ Checking test 014 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.527489
+The total amount of wall time                        = 52.581130
 
-Test 014 fv3_ccpp_iau PASS
+Test 014 fv3_iau PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lheatstrg_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_lheatstrg_prod
-Checking test 015 fv3_ccpp_lheatstrg results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_lheatstrg
+Checking test 015 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -904,14 +904,14 @@ Checking test 015 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.427079
+The total amount of wall time                        = 52.169134
 
-Test 015 fv3_ccpp_lheatstrg PASS
+Test 015 fv3_lheatstrg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_multigases_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_multigases_prod
-Checking test 016 fv3_ccpp_multigases results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_multigases_repro
+Checking test 016 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -981,14 +981,14 @@ Checking test 016 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 105.517589
+The total amount of wall time                        = 130.857413
 
-Test 016 fv3_ccpp_multigases PASS
+Test 016 fv3_multigases PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_32bit_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_control_32bit_prod
-Checking test 017 fv3_ccpp_control_32bit results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control_32bit
+Checking test 017 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1052,14 +1052,14 @@ Checking test 017 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.975294
+The total amount of wall time                        = 57.663932
 
-Test 017 fv3_ccpp_control_32bit PASS
+Test 017 fv3_control_32bit PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_stretched_prod
-Checking test 018 fv3_ccpp_stretched results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched
+Checking test 018 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1111,14 +1111,14 @@ Checking test 018 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 393.675727
+The total amount of wall time                        = 393.187766
 
-Test 018 fv3_ccpp_stretched PASS
+Test 018 fv3_stretched PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_stretched_nest_prod
-Checking test 019 fv3_ccpp_stretched_nest results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched_nest
+Checking test 019 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1181,40 +1181,40 @@ Checking test 019 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 426.333542
+The total amount of wall time                        = 423.882746
 
-Test 019 fv3_ccpp_stretched_nest PASS
+Test 019 fv3_stretched_nest PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_control_prod
-Checking test 020 fv3_ccpp_regional_control results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_control
+Checking test 020 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 856.461944
+The total amount of wall time                        = 858.855780
 
-Test 020 fv3_ccpp_regional_control PASS
+Test 020 fv3_regional_control PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_restart_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_restart_prod
-Checking test 021 fv3_ccpp_regional_restart results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_restart
+Checking test 021 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 479.157608
+The total amount of wall time                        = 480.755054
 
-Test 021 fv3_ccpp_regional_restart PASS
+Test 021 fv3_regional_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_quilt_prod
-Checking test 022 fv3_ccpp_regional_quilt results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt
+Checking test 022 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1224,14 +1224,14 @@ Checking test 022 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 844.481965
+The total amount of wall time                        = 848.654061
 
-Test 022 fv3_ccpp_regional_quilt PASS
+Test 022 fv3_regional_quilt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_hafs_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 023 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt_hafs
+Checking test 023 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1239,28 +1239,28 @@ Checking test 023 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 849.056197
+The total amount of wall time                        = 850.474449
 
-Test 023 fv3_ccpp_regional_quilt_hafs PASS
+Test 023 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 024 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt_netcdf_parallel
+Checking test 024 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 842.995023
+The total amount of wall time                        = 854.368540
 
-Test 024 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 024 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfdlmp_prod
-Checking test 025 fv3_ccpp_gfdlmp results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmp
+Checking test 025 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1304,14 +1304,14 @@ Checking test 025 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.895407
+The total amount of wall time                        = 60.547225
 
-Test 025 fv3_ccpp_gfdlmp PASS
+Test 025 fv3_gfdlmp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_gwd_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 026 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_gwd
+Checking test 026 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1355,14 +1355,14 @@ Checking test 026 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 61.145853
+The total amount of wall time                        = 60.741896
 
-Test 026 fv3_ccpp_gfdlmprad_gwd PASS
+Test 026 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 027 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_noahmp
+Checking test 027 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1406,14 +1406,14 @@ Checking test 027 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.901828
+The total amount of wall time                        = 61.105010
 
-Test 027 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 027 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_csawmg_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_csawmg_prod
-Checking test 028 fv3_ccpp_csawmg results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_csawmg
+Checking test 028 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1457,14 +1457,14 @@ Checking test 028 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 152.610570
+The total amount of wall time                        = 150.699055
 
-Test 028 fv3_ccpp_csawmg PASS
+Test 028 fv3_csawmg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmf_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_satmedmf_prod
-Checking test 029 fv3_ccpp_satmedmf results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_satmedmf
+Checking test 029 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1508,14 +1508,14 @@ Checking test 029 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.117735
+The total amount of wall time                        = 65.351403
 
-Test 029 fv3_ccpp_satmedmf PASS
+Test 029 fv3_satmedmf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmfq_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_satmedmfq_prod
-Checking test 030 fv3_ccpp_satmedmfq results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_satmedmfq
+Checking test 030 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1559,14 +1559,14 @@ Checking test 030 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.810936
+The total amount of wall time                        = 65.648666
 
-Test 030 fv3_ccpp_satmedmfq PASS
+Test 030 fv3_satmedmfq PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_32bit_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 031 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmp_32bit
+Checking test 031 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1610,14 +1610,14 @@ Checking test 031 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.524905
+The total amount of wall time                        = 52.508828
 
-Test 031 fv3_ccpp_gfdlmp_32bit PASS
+Test 031 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 032 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_32bit_post
+Checking test 032 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1665,14 +1665,14 @@ Checking test 032 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 97.468580
+The total amount of wall time                        = 96.512019
 
-Test 032 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 032 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_cpt_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_cpt_prod
-Checking test 033 fv3_ccpp_cpt results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_cpt
+Checking test 033 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1722,14 +1722,14 @@ Checking test 033 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 354.875700
+The total amount of wall time                        = 349.283110
 
-Test 033 fv3_ccpp_cpt PASS
+Test 033 fv3_cpt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gsd_prod
-Checking test 034 fv3_ccpp_gsd results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd
+Checking test 034 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1817,14 +1817,14 @@ Checking test 034 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 240.290235
+The total amount of wall time                        = 244.449669
 
-Test 034 fv3_ccpp_gsd PASS
+Test 034 fv3_gsd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_thompson_prod
-Checking test 035 fv3_ccpp_thompson results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson
+Checking test 035 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1888,14 +1888,14 @@ Checking test 035 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 113.245163
+The total amount of wall time                        = 116.800567
 
-Test 035 fv3_ccpp_thompson PASS
+Test 035 fv3_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_thompson_no_aero_prod
-Checking test 036 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_no_aero
+Checking test 036 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1959,14 +1959,14 @@ Checking test 036 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.577594
+The total amount of wall time                        = 108.742722
 
-Test 036 fv3_ccpp_thompson_no_aero PASS
+Test 036 fv3_thompson_no_aero PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v15p2_prod
-Checking test 037 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2
+Checking test 037 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2030,14 +2030,14 @@ Checking test 037 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 117.234830
+The total amount of wall time                        = 118.552870
 
-Test 037 fv3_ccpp_gfs_v15p2 PASS
+Test 037 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_prod
-Checking test 038 fv3_ccpp_gfs_v16 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16
+Checking test 038 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2113,14 +2113,14 @@ Checking test 038 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 146.070385
+The total amount of wall time                        = 145.083847
 
-Test 038 fv3_ccpp_gfs_v16 PASS
+Test 038 fv3_gfs_v16 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_restart_prod
-Checking test 039 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_restart
+Checking test 039 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2166,14 +2166,14 @@ Checking test 039 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 75.699602
+The total amount of wall time                        = 75.241385
 
-Test 039 fv3_ccpp_gfs_v16_restart PASS
+Test 039 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_stochy_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 040 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_stochy
+Checking test 040 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2237,14 +2237,14 @@ Checking test 040 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 66.131955
+The total amount of wall time                        = 66.542223
 
-Test 040 fv3_ccpp_gfs_v16_stochy PASS
+Test 040 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 041 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_RRTMGP
+Checking test 041 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2308,14 +2308,14 @@ Checking test 041 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 186.196478
+The total amount of wall time                        = 187.628841
 
-Test 041 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 041 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 042 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP
+Checking test 042 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2379,14 +2379,14 @@ Checking test 042 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 188.927299
+The total amount of wall time                        = 189.007064
 
-Test 042 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 042 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 043 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 043 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2444,14 +2444,14 @@ Checking test 043 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 802.617376
+The total amount of wall time                        = 801.382491
 
-Test 043 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 043 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 044 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 044 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2515,14 +2515,14 @@ Checking test 044 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 663.423530
+The total amount of wall time                        = 768.356275
 
-Test 044 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 044 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmg_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfsv16_csawmg_prod
-Checking test 045 fv3_ccpp_gfsv16_csawmg results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_csawmg
+Checking test 045 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2566,14 +2566,14 @@ Checking test 045 fv3_ccpp_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 162.800113
+The total amount of wall time                        = 163.570737
 
-Test 045 fv3_ccpp_gfsv16_csawmg PASS
+Test 045 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmgt_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfsv16_csawmgt_prod
-Checking test 046 fv3_ccpp_gfsv16_csawmgt results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_csawmgt
+Checking test 046 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2617,14 +2617,14 @@ Checking test 046 fv3_ccpp_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 160.934900
+The total amount of wall time                        = 160.409704
 
-Test 046 fv3_ccpp_gfsv16_csawmgt PASS
+Test 046 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gocart_clm_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gocart_clm_prod
-Checking test 047 fv3_ccpp_gocart_clm results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gocart_clm
+Checking test 047 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2668,14 +2668,14 @@ Checking test 047 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 66.963537
+The total amount of wall time                        = 67.442475
 
-Test 047 fv3_ccpp_gocart_clm PASS
+Test 047 fv3_gocart_clm PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_flake_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_flake_prod
-Checking test 048 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_flake
+Checking test 048 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2739,14 +2739,14 @@ Checking test 048 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 119.851463
+The total amount of wall time                        = 119.774709
 
-Test 048 fv3_ccpp_gfs_v16_flake PASS
+Test 048 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 049 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_HAFS_v0_hwrf_thompson
+Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2810,14 +2810,14 @@ Checking test 049 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 191.677747
+The total amount of wall time                        = 191.359263
 
-Test 049 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 049 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -2831,14 +2831,14 @@ Checking test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 356.551422
+The total amount of wall time                        = 357.358522
 
-Test 050 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 050 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 051 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1
+Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2896,14 +2896,14 @@ Checking test 051 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 234.051149
+The total amount of wall time                        = 228.829873
 
-Test 051 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 051 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1_warmstart
+Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2961,14 +2961,85 @@ Checking test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 230.930722
+The total amount of wall time                        = 229.672114
+
+Test 052 fv3_gfsv16_ugwpv1_warmstart PASS
+
+
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_ras
+Checking test 053 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 123.129870
 
-Test 052 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 053 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 053 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_debug
+Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3032,14 +3103,14 @@ Checking test 053 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 272.393572
+The total amount of wall time                        = 271.873950
 
-Test 053 fv3_ccpp_gfs_v15p2_debug PASS
+Test 054 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_debug_prod
-Checking test 054 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_debug
+Checking test 055 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3103,14 +3174,14 @@ Checking test 054 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 209.701201
+The total amount of wall time                        = 207.082359
 
-Test 054 fv3_ccpp_gfs_v16_debug PASS
+Test 055 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3174,14 +3245,14 @@ Checking test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 437.835363
+The total amount of wall time                        = 438.413542
 
-Test 055 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 056 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 056 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_debug
+Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3245,28 +3316,28 @@ Checking test 056 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 447.543650
+The total amount of wall time                        = 447.659668
 
-Test 056 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 057 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_regional_control_debug_prod
-Checking test 057 fv3_ccpp_regional_control_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_control_debug
+Checking test 058 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 457.030482
+The total amount of wall time                        = 458.928966
 
-Test 057 fv3_ccpp_regional_control_debug PASS
+Test 058 fv3_regional_control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_control_debug_prod
-Checking test 058 fv3_ccpp_control_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control_debug
+Checking test 059 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3292,14 +3363,14 @@ Checking test 058 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 159.978141
+The total amount of wall time                        = 157.690354
 
-Test 058 fv3_ccpp_control_debug PASS
+Test 059 fv3_control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_stretched_nest_debug_prod
-Checking test 059 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched_nest_debug
+Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3315,14 +3386,14 @@ Checking test 059 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 534.778950
+The total amount of wall time                        = 534.941205
 
-Test 059 fv3_ccpp_stretched_nest_debug PASS
+Test 060 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gsd_debug_prod
-Checking test 060 fv3_ccpp_gsd_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd_debug
+Checking test 061 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3386,14 +3457,14 @@ Checking test 060 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 240.124856
+The total amount of wall time                        = 238.318598
 
-Test 060 fv3_ccpp_gsd_debug PASS
+Test 061 fv3_gsd_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_diag3d_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 061 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd_diag3d_debug
+Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3457,14 +3528,14 @@ Checking test 061 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 270.495321
+The total amount of wall time                        = 270.684010
 
-Test 061 fv3_ccpp_gsd_diag3d_debug PASS
+Test 062 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_thompson_debug_prod
-Checking test 062 fv3_ccpp_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_debug
+Checking test 063 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3528,14 +3599,14 @@ Checking test 062 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 416.982382
+The total amount of wall time                        = 417.304640
 
-Test 062 fv3_ccpp_thompson_debug PASS
+Test 063 fv3_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 063 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_no_aero_debug
+Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3599,14 +3670,14 @@ Checking test 063 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 403.741014
+The total amount of wall time                        = 402.109266
 
-Test 063 fv3_ccpp_thompson_no_aero_debug PASS
+Test 064 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 064 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_rrfs_v1beta_debug
+Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3670,14 +3741,14 @@ Checking test 064 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 231.947853
+The total amount of wall time                        = 232.941492
 
-Test 064 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 065 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3741,14 +3812,14 @@ Checking test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 247.905366
+The total amount of wall time                        = 247.699269
 
-Test 065 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 066 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -3762,14 +3833,14 @@ Checking test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 463.748015
+The total amount of wall time                        = 462.514551
 
-Test 066 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_82048/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 067 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1_debug
+Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3827,11 +3898,82 @@ Checking test 067 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 711.012031
+The total amount of wall time                        = 708.519770
+
+Test 068 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_ras_debug
+Checking test 069 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 395.906445
 
-Test 067 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 069 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 18:14:39 GMT 2021
-Elapsed time: 02h:43m:24s. Have a nice day!
+Wed Mar 17 21:50:12 GMT 2021
+Elapsed time: 02h:16m:39s. Have a nice day!
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 8dffe79b7b..cba4c74880 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -390,6 +390,7 @@ export IMFSHALCNV=2
 export HWRF_SAMFSHAL=.F.
 export IMFDEEPCNV=2
 export HWRF_SAMFDEEP=.F.
+export RAS=.F.
 
 # SFC
 export DO_MYJSFC=.F.
diff --git a/tests/fv3_conf/ccpp_c96_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_c96_HAFS_v0_hwrf_run.IN
rename to tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN
diff --git a/tests/fv3_conf/ccpp_cpt_run.IN b/tests/fv3_conf/ccpp_cpt_run.IN
deleted file mode 100644
index 8828656bed..0000000000
--- a/tests/fv3_conf/ccpp_cpt_run.IN
+++ /dev/null
@@ -1,20 +0,0 @@
-rm -fr INPUT RESTART
-inputdir=FV3_input_data_127
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb . 
-cp    @[INPUTDATA_ROOT]/${inputdir}/*_table .
-cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_mg3tke  diag_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_csawmg3shoc field_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/*configure .
diff --git a/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN b/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN
deleted file mode 100644
index 8828656bed..0000000000
--- a/tests/fv3_conf/ccpp_csawmg3shoc127_run.IN
+++ /dev/null
@@ -1,20 +0,0 @@
-rm -fr INPUT RESTART
-inputdir=FV3_input_data_127
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb . 
-cp    @[INPUTDATA_ROOT]/${inputdir}/*_table .
-cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_mg3tke  diag_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_csawmg3shoc field_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/*configure .
diff --git a/tests/fv3_conf/ccpp_csawmg_run.IN b/tests/fv3_conf/ccpp_csawmg_run.IN
deleted file mode 100644
index 073cdb250c..0000000000
--- a/tests/fv3_conf/ccpp_csawmg_run.IN
+++ /dev/null
@@ -1,50 +0,0 @@
-rm -fr INPUT RESTART
-
-UNIT_TEST=${UNIT_TEST:-false}
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-
-  if [[ ${UNIT_TEST} == false ]]; then
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-  else
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-    rm -f INPUT/fv_core.res.*
-    rm -f INPUT/fv_srf_wnd.res.*
-    rm -f INPUT/fv_tracer.res.*
-    rm -f INPUT/phy_data.*
-    rm -f INPUT/sfc_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
-      [ -e $RFILE ] || exit 1
-      RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-      cp $RFILE INPUT/${RFILE_NEW}
-    done
-  fi
-fi
-
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgrs    diag_table
-#cp   @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgrs   field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmg field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
-for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-ln -sf merra2C.aerclim.2003-2014.m${n}.nc  aeroclim.m${n}.nc
-done
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
diff --git a/tests/fv3_conf/ccpp_csawmgshoc_run.IN b/tests/fv3_conf/ccpp_csawmgshoc_run.IN
deleted file mode 100644
index 6c7bbd8ed3..0000000000
--- a/tests/fv3_conf/ccpp_csawmgshoc_run.IN
+++ /dev/null
@@ -1,31 +0,0 @@
-rm -fr INPUT RESTART
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgtkers     diag_table
-#cp   @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgtkers    field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmgshoc field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
-for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-ln -sf merra2C.aerclim.2003-2014.m${n}.nc  aeroclim.m${n}.nc
-done
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
diff --git a/tests/fv3_conf/ccpp_gfdlmp_run.IN b/tests/fv3_conf/ccpp_gfdlmp_run.IN
deleted file mode 100644
index af0e3d5f84..0000000000
--- a/tests/fv3_conf/ccpp_gfdlmp_run.IN
+++ /dev/null
@@ -1,49 +0,0 @@
-rm -fr INPUT RESTART
-
-UNIT_TEST=${UNIT_TEST:-false}
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-
-  if [[ ${UNIT_TEST} == false ]]; then
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-  else
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-    rm -f INPUT/fv_core.res.*
-    rm -f INPUT/fv_srf_wnd.res.*
-    rm -f INPUT/fv_tracer.res.*
-    rm -f INPUT/phy_data.*
-    rm -f INPUT/sfc_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
-      [ -e $RFILE ] || exit 1
-      RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-      cp $RFILE INPUT/${RFILE_NEW}
-    done
-  fi
-fi
-
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/global_o3prdlos.f77 .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-
-if [ $CPLWAV = .T. ]; then
-cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
-cp    @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
-fi
-
-if [[ $POSTAPP = 'global' ]]; then
-    cp ${PATHRT}/parm/post_itag itag
-    cp ${PATHRT}/parm/postxconfig-NT.txt postxconfig-NT.txt
-    cp ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
-    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
-fi
diff --git a/tests/fv3_conf/ccpp_gfs_v15_run.IN b/tests/fv3_conf/ccpp_gfs_v15_run.IN
deleted file mode 100644
index 6318e9b7b6..0000000000
--- a/tests/fv3_conf/ccpp_gfs_v15_run.IN
+++ /dev/null
@@ -1,23 +0,0 @@
-rm -fr INPUT RESTART
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-
-if [ $DO_RRTMGP = .T. ]; then
-cp    @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
-fi
diff --git a/tests/fv3_conf/ccpp_gfs_v16_run.IN b/tests/fv3_conf/ccpp_gfs_v16_run.IN
deleted file mode 100644
index eb5b247574..0000000000
--- a/tests/fv3_conf/ccpp_gfs_v16_run.IN
+++ /dev/null
@@ -1,25 +0,0 @@
-rm -fr INPUT RESTART
-rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/ INPUT/
-mkdir RESTART
-if [ $WARM_START = .T. ]; then
-  rsync -arv ../fv3_ccpp_gfs_v16${RT_SUFFIX}/RESTART/ INPUT/
-  cd INPUT
-  rename 20161004.000000. '' 20161004.000000.*
-  cd ..
-fi
-
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_suite2 field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-
-if [ $DO_RRTMGP = .T. ]; then
-  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
-fi
diff --git a/tests/fv3_conf/ccpp_gfsv16_csawmg_run.IN b/tests/fv3_conf/ccpp_gfsv16_csawmg_run.IN
deleted file mode 100644
index 9b380ec48a..0000000000
--- a/tests/fv3_conf/ccpp_gfsv16_csawmg_run.IN
+++ /dev/null
@@ -1,32 +0,0 @@
-
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb . 
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-#cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgrs    diag_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_aod diag_table
-#cp   @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgrs   field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmgshoc field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
-for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-ln -sf merra2C.aerclim.2003-2014.m${n}.nc  aeroclim.m${n}.nc
-done
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
diff --git a/tests/fv3_conf/ccpp_multigases_run.IN b/tests/fv3_conf/ccpp_multigases_run.IN
deleted file mode 100644
index 183649bfc9..0000000000
--- a/tests/fv3_conf/ccpp_multigases_run.IN
+++ /dev/null
@@ -1,32 +0,0 @@
-
-inputdir=FV3_input_data_149
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
-if [ $OZ_PHYS_NEW = .T. ]; then
-  cp  @[INPUTDATA_ROOT]/${inputdir}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-elif [ $OZ_PHYS_OLD = .T. ]; then
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/global_o3prdlos.f77 .
-fi
-if [ $H2O_PHYS = .T. ]; then
-  cp  @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-fi
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
-cp    @[INPUTDATA_ROOT]/${inputdir}/*configure .
-cp    @[INPUTDATA_ROOT]/${inputdir}/*_table .
-cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_multi_gases diag_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_multi_gases field_table
-
-if [ $CPLWAV = .T. ]; then
-cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
-cp    @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
-cp    @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/rmp_src* .
-fi
diff --git a/tests/fv3_conf/ccpp_regional_c786_run.IN b/tests/fv3_conf/ccpp_regional_c786_run.IN
deleted file mode 100644
index e450d34003..0000000000
--- a/tests/fv3_conf/ccpp_regional_c786_run.IN
+++ /dev/null
@@ -1,25 +0,0 @@
-rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
-
-rm -rf INPUT RESTART
-mkdir  INPUT RESTART
-
-rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/INPUT/. INPUT/.
-
-if [ $WARM_START = .T. ]; then
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res             INPUT/coupler.res
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc          INPUT/fv_core.res.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc    INPUT/fv_core.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc  INPUT/fv_tracer.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc             INPUT/phy_data.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc             INPUT/sfc_data.nc
-fi
-
-if [ $OZ_PHYS_NEW = .T. ]; then
-  cp  @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-elif [ $OZ_PHYS_OLD = .T. ]; then
-  cp  @[INPUTDATA_ROOT]/FV3_input_data/INPUT/global_o3prdlos.f77 .
-fi
-if [ $H2O_PHYS = .T. ]; then
-  cp  @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-fi
diff --git a/tests/fv3_conf/ccpp_satmedmf_run.IN b/tests/fv3_conf/ccpp_satmedmf_run.IN
deleted file mode 100644
index 400eca407f..0000000000
--- a/tests/fv3_conf/ccpp_satmedmf_run.IN
+++ /dev/null
@@ -1,46 +0,0 @@
-rm -fr INPUT RESTART
-
-UNIT_TEST=${UNIT_TEST:-false}
-if [ $NPX = 97 ]; then
-  inputdir=FV3_input_data
-elif [ $NPX = 193 ]; then
-  inputdir=FV3_input_data_c192
-elif [ $NPX = 385 ]; then
-  inputdir=FV3_input_data_c384
-elif [ $NPX = 769 ]; then
-  inputdir=FV3_input_data_c768
-fi
-echo "inputdir=$inputdir,NPX=$NPX"
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-
-  if [[ ${UNIT_TEST} == false ]]; then
-    cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-  else
-    cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-    rm -f INPUT/fv_core.res.*
-    rm -f INPUT/fv_srf_wnd.res.*
-    rm -f INPUT/fv_tracer.res.*
-    rm -f INPUT/phy_data.*
-    rm -f INPUT/sfc_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
-      [ -e $RFILE ] || exit 1
-      RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-      cp $RFILE INPUT/${RFILE_NEW}
-    done
-  fi
-fi
-
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/global_o3prdlos.f77 .
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
-cp    @[INPUTDATA_ROOT]/${inputdir}/*_table .
-cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_satmedmf field_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/*configure .
diff --git a/tests/fv3_conf/ccpp_control_run.IN b/tests/fv3_conf/control_run.IN
similarity index 70%
rename from tests/fv3_conf/ccpp_control_run.IN
rename to tests/fv3_conf/control_run.IN
index 68b3a1b1fc..ed2f48cb37 100644
--- a/tests/fv3_conf/ccpp_control_run.IN
+++ b/tests/fv3_conf/control_run.IN
@@ -22,29 +22,29 @@ else
     SUFFIX=${BL_SUFFIX}
   fi
 
-  rsync -arv ../fv3_ccpp_control${SUFFIX}/RESTART/ INPUT/
+  rsync -arv ../fv3_control${SUFFIX}/RESTART/ INPUT/
   if [[ $IAU_INC_FILES = 'fv3_increment.nc' ]] || [[ $READ_INCREMENT = '.T.' ]]; then
     #read_inc and iau tests restart from fh=24
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/coupler.res INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_core.res.* INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_srf_wnd.res.* INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/fv_tracer.* INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/phy_data.* INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/sfc_data.* INPUT/.
-    cp ../fv3_ccpp_control${SUFFIX}/INPUT/fv3_increment.nc INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/coupler.res INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/fv_core.res.* INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/fv_srf_wnd.res.* INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/fv_tracer.* INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/phy_data.* INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/sfc_data.* INPUT/.
+    cp ../fv3_control${SUFFIX}/INPUT/fv3_increment.nc INPUT/.
     cd INPUT
   else
     #restart test start from fh=12
-    cp ../fv3_ccpp_control${SUFFIX}/RESTART/20161003.120000.* INPUT/.
+    cp ../fv3_control${SUFFIX}/RESTART/20161003.120000.* INPUT/.
     cd INPUT
     for RFILE in 20161003.120000.*; do
       [ -e $RFILE ] || exit 1
       mv $RFILE ${RFILE#20161003.120000.}
     done
   fi
-  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/grid_spec.nc .
-  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/*_grid.tile*.nc .
-  cp ../../fv3_ccpp_control${SUFFIX}/INPUT/oro_data.tile*.nc .
+  cp ../../fv3_control${SUFFIX}/INPUT/grid_spec.nc .
+  cp ../../fv3_control${SUFFIX}/INPUT/*_grid.tile*.nc .
+  cp ../../fv3_control${SUFFIX}/INPUT/oro_data.tile*.nc .
   cd ..
 
 fi
diff --git a/tests/fv3_conf/cpt_run.IN b/tests/fv3_conf/cpt_run.IN
index fea2ec1f58..8828656bed 100644
--- a/tests/fv3_conf/cpt_run.IN
+++ b/tests/fv3_conf/cpt_run.IN
@@ -1,3 +1,4 @@
+rm -fr INPUT RESTART
 inputdir=FV3_input_data_127
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
diff --git a/tests/fv3_conf/csawmg3shoc127_run.IN b/tests/fv3_conf/csawmg3shoc127_run.IN
index bc57248a2e..8828656bed 100644
--- a/tests/fv3_conf/csawmg3shoc127_run.IN
+++ b/tests/fv3_conf/csawmg3shoc127_run.IN
@@ -1,36 +1,19 @@
+rm -fr INPUT RESTART
 inputdir=FV3_input_data_127
-
-UNIT_TEST=${UNIT_TEST:-false}
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
   mkdir RESTART
 else
   mkdir INPUT RESTART
-  if [[ ${UNIT_TEST} == false ]]; then
-    cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-  else
-    cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
-    rm -f INPUT/fv_core.res.*
-    rm -f INPUT/fv_srf_wnd.res.*
-    rm -f INPUT/fv_tracer.res.*
-    rm -f INPUT/phy_data.*
-    rm -f INPUT/sfc_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
-      [ -e $RFILE ] || exit 1
-      RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-      cp $RFILE INPUT/${RFILE_NEW}
-    done
-  fi
+  cp -r @[INPUTDATA_ROOT]/${inputdir}/RESTART/* ./INPUT
 fi
-
 cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/aerosol.dat .
 cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/sfc_emissivity_idx.txt .
 cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
 cp    @[INPUTDATA_ROOT]/${inputdir}/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
+cp    @[INPUTDATA_ROOT]/${inputdir}/*grb . 
 cp    @[INPUTDATA_ROOT]/${inputdir}/*_table .
 cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_mg3tke  diag_table
 cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_csawmg3shoc field_table
diff --git a/tests/fv3_conf/csawmg_run.IN b/tests/fv3_conf/csawmg_run.IN
index 28b700f31d..073cdb250c 100644
--- a/tests/fv3_conf/csawmg_run.IN
+++ b/tests/fv3_conf/csawmg_run.IN
@@ -1,3 +1,5 @@
+rm -fr INPUT RESTART
+
 UNIT_TEST=${UNIT_TEST:-false}
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
diff --git a/tests/fv3_conf/csawmgshoc_run.IN b/tests/fv3_conf/csawmgshoc_run.IN
index 2be94b3c25..6c7bbd8ed3 100644
--- a/tests/fv3_conf/csawmgshoc_run.IN
+++ b/tests/fv3_conf/csawmgshoc_run.IN
@@ -1,28 +1,11 @@
-UNIT_TEST=${UNIT_TEST:-false}
+rm -fr INPUT RESTART
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
   mkdir RESTART
 else
   mkdir INPUT RESTART
-
-  if [[ ${UNIT_TEST} == false ]]; then
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-  else
-    cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-    rm -f INPUT/fv_core.res.*
-    rm -f INPUT/fv_srf_wnd.res.*
-    rm -f INPUT/fv_tracer.res.*
-    rm -f INPUT/phy_data.*
-    rm -f INPUT/sfc_data.*
-    for RFILE in ../${TEST_NAME}${BL_SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
-      [ -e $RFILE ] || exit 1
-      RFILE_OLD=$(basename $RFILE)
-      RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
-      cp $RFILE INPUT/${RFILE_NEW}
-    done
-  fi
+  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
 fi
-
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
@@ -35,3 +18,14 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgtkers     diag_table
 #cp   @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgtkers    field_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmgshoc field_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
+for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
+ln -sf merra2C.aerclim.2003-2014.m${n}.nc  aeroclim.m${n}.nc
+done
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
diff --git a/tests/fv3_conf/ccpp_esg_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_esg_HAFS_v0_hwrf_run.IN
rename to tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN
diff --git a/tests/fv3_conf/ccpp_gf_thompson_run.IN b/tests/fv3_conf/gf_thompson_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_gf_thompson_run.IN
rename to tests/fv3_conf/gf_thompson_run.IN
diff --git a/tests/fv3_conf/gfdlmp_run.IN b/tests/fv3_conf/gfdlmp_run.IN
index 92a19ba1c7..af0e3d5f84 100644
--- a/tests/fv3_conf/gfdlmp_run.IN
+++ b/tests/fv3_conf/gfdlmp_run.IN
@@ -1,5 +1,6 @@
-UNIT_TEST=${UNIT_TEST:-false}
+rm -fr INPUT RESTART
 
+UNIT_TEST=${UNIT_TEST:-false}
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
   mkdir RESTART
@@ -39,3 +40,10 @@ if [ $CPLWAV = .T. ]; then
 cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
 cp    @[INPUTDATA_ROOT_WW3]/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
 fi
+
+if [[ $POSTAPP = 'global' ]]; then
+    cp ${PATHRT}/parm/post_itag itag
+    cp ${PATHRT}/parm/postxconfig-NT.txt postxconfig-NT.txt
+    cp ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
+    cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+fi
diff --git a/tests/fv3_conf/gfs_v15_run.IN b/tests/fv3_conf/gfs_v15_run.IN
index 79e9537fc2..6318e9b7b6 100644
--- a/tests/fv3_conf/gfs_v15_run.IN
+++ b/tests/fv3_conf/gfs_v15_run.IN
@@ -17,3 +17,7 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
+
+if [ $DO_RRTMGP = .T. ]; then
+cp    @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi
diff --git a/tests/fv3_conf/ccpp_gfs_v16_flake_run.IN b/tests/fv3_conf/gfs_v16_flake_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_gfs_v16_flake_run.IN
rename to tests/fv3_conf/gfs_v16_flake_run.IN
diff --git a/tests/fv3_conf/gfs_v16_run.IN b/tests/fv3_conf/gfs_v16_run.IN
index a9210d2c39..bd8c0500aa 100644
--- a/tests/fv3_conf/gfs_v16_run.IN
+++ b/tests/fv3_conf/gfs_v16_run.IN
@@ -1,11 +1,13 @@
 rm -fr INPUT RESTART
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
+rsync -arv @[INPUTDATA_ROOT]/FV3_input_data/INPUT/ INPUT/
+mkdir RESTART
+if [ $WARM_START = .T. ]; then
+  rsync -arv ../fv3_gfs_v16${RT_SUFFIX}/RESTART/ INPUT/
+  cd INPUT
+  rename 20161004.000000. '' 20161004.000000.*
+  cd ..
 fi
+
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
@@ -17,3 +19,7 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_suite2 field_table
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
+
+if [ $DO_RRTMGP = .T. ]; then
+  cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi
diff --git a/tests/fv3_conf/ccpp_gfs_v16_run_c192L127.IN b/tests/fv3_conf/gfs_v16_run_c192L127.IN
similarity index 93%
rename from tests/fv3_conf/ccpp_gfs_v16_run_c192L127.IN
rename to tests/fv3_conf/gfs_v16_run_c192L127.IN
index 53dd35df26..d552738fe9 100644
--- a/tests/fv3_conf/ccpp_gfs_v16_run_c192L127.IN
+++ b/tests/fv3_conf/gfs_v16_run_c192L127.IN
@@ -2,7 +2,7 @@ rm -fr INPUT RESTART
 rsync -arv @[INPUTDATA_ROOT]/FV3_input_data_c192L127/INPUT/ INPUT/
 mkdir RESTART
 if [ $WARM_START = .T. ]; then
-  rsync -arv ../fv3_ccpp_gfs_v16_c192L127${RT_SUFFIX}/RESTART/ INPUT/
+  rsync -arv ../fv3_gfs_v16_c192L127${RT_SUFFIX}/RESTART/ INPUT/
   cd INPUT
   rename 20190120.000000. '' 20190120.000000.*
   cd ..
diff --git a/tests/fv3_conf/ccpp_gfsv16_ugwpv1_run.IN b/tests/fv3_conf/gfsv16_ugwpv1_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_gfsv16_ugwpv1_run.IN
rename to tests/fv3_conf/gfsv16_ugwpv1_run.IN
diff --git a/tests/fv3_conf/ccpp_gocart.IN b/tests/fv3_conf/gocart.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_gocart.IN
rename to tests/fv3_conf/gocart.IN
diff --git a/tests/fv3_conf/ccpp_gsd_run.IN b/tests/fv3_conf/gsd_run.IN
similarity index 98%
rename from tests/fv3_conf/ccpp_gsd_run.IN
rename to tests/fv3_conf/gsd_run.IN
index ac566483e4..e071fa3938 100644
--- a/tests/fv3_conf/ccpp_gsd_run.IN
+++ b/tests/fv3_conf/gsd_run.IN
@@ -6,7 +6,7 @@ else
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/grid_spec*.nc INPUT/
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/C96_grid*.nc INPUT/
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/oro_data*.nc INPUT/
-  cp ../fv3_ccpp_gsd_coldstart${RT_SUFFIX}/RESTART/* INPUT/
+  cp ../fv3_gsd_coldstart${RT_SUFFIX}/RESTART/* INPUT/
 fi
 
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
diff --git a/tests/fv3_conf/ccpp_gsd_sar_run.IN b/tests/fv3_conf/gsd_sar_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_gsd_sar_run.IN
rename to tests/fv3_conf/gsd_sar_run.IN
diff --git a/tests/fv3_conf/rasmgshoc_run.IN b/tests/fv3_conf/rasmgshoc_run.IN
deleted file mode 100644
index 1e0fc42274..0000000000
--- a/tests/fv3_conf/rasmgshoc_run.IN
+++ /dev/null
@@ -1,20 +0,0 @@
-
-if [ $WARM_START = .F. ]; then
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/INPUT .
-  mkdir RESTART
-else
-  mkdir INPUT RESTART
-  cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
-fi
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb . 
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgtkers    diag_table
-#cp   @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgtkers   field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/field_table_rasmgshoc field_table
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
diff --git a/tests/fv3_conf/regional_c786_run.IN b/tests/fv3_conf/regional_c786_run.IN
new file mode 100644
index 0000000000..ddb18043a1
--- /dev/null
+++ b/tests/fv3_conf/regional_c786_run.IN
@@ -0,0 +1,25 @@
+rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
+
+rm -rf INPUT RESTART
+mkdir  INPUT RESTART
+
+rsync -arv @[INPUTDATA_ROOT]/@[INPUT_DIR]/INPUT/. INPUT/.
+
+if [ $WARM_START = .T. ]; then
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res             INPUT/coupler.res
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc          INPUT/fv_core.res.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc    INPUT/fv_core.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc  INPUT/fv_tracer.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc             INPUT/phy_data.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc             INPUT/sfc_data.nc
+fi
+
+if [ $OZ_PHYS_NEW = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
+elif [ $OZ_PHYS_OLD = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/FV3_input_data/INPUT/global_o3prdlos.f77 .
+fi
+if [ $H2O_PHYS = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
+fi
diff --git a/tests/fv3_conf/ccpp_regional_run.IN b/tests/fv3_conf/regional_run.IN
similarity index 65%
rename from tests/fv3_conf/ccpp_regional_run.IN
rename to tests/fv3_conf/regional_run.IN
index 76cc74bd72..cc7d84dc34 100644
--- a/tests/fv3_conf/ccpp_regional_run.IN
+++ b/tests/fv3_conf/regional_run.IN
@@ -9,13 +9,13 @@ mkdir  INPUT RESTART
 rsync -arv @[INPUTDATA_ROOT]/fv3_regional_control/INPUT/. INPUT/.
 
 if [ $WARM_START = .T. ]; then
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res             INPUT/coupler.res
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc          INPUT/fv_core.res.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc    INPUT/fv_core.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc  INPUT/fv_tracer.res.tile1.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc             INPUT/phy_data.nc
-    cp ../fv3_ccpp_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc             INPUT/sfc_data.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res             INPUT/coupler.res
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc          INPUT/fv_core.res.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc    INPUT/fv_core.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc  INPUT/fv_tracer.res.tile1.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc             INPUT/phy_data.nc
+    cp ../fv3_regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc             INPUT/sfc_data.nc
 fi
 if [ $WRITE_RESTART_WITH_BCS = .true. ]; then
     cp @[INPUTDATA_ROOT]/fv3_regional_control/RESTART/fv_core.res.tile1_new.nc                           RESTART/fv_core.res.tile1_new.nc
diff --git a/tests/fv3_conf/satmedmf_run.IN b/tests/fv3_conf/satmedmf_run.IN
index c62aa9ce79..400eca407f 100644
--- a/tests/fv3_conf/satmedmf_run.IN
+++ b/tests/fv3_conf/satmedmf_run.IN
@@ -1,4 +1,6 @@
+rm -fr INPUT RESTART
 
+UNIT_TEST=${UNIT_TEST:-false}
 if [ $NPX = 97 ]; then
   inputdir=FV3_input_data
 elif [ $NPX = 193 ]; then
@@ -9,8 +11,6 @@ elif [ $NPX = 769 ]; then
   inputdir=FV3_input_data_c768
 fi
 echo "inputdir=$inputdir,NPX=$NPX"
-
-UNIT_TEST=${UNIT_TEST:-false}
 if [ $WARM_START = .F. ]; then
   cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT .
   mkdir RESTART
diff --git a/tests/fv3_conf/ccpp_stretched_run.IN b/tests/fv3_conf/stretched_run.IN
similarity index 100%
rename from tests/fv3_conf/ccpp_stretched_run.IN
rename to tests/fv3_conf/stretched_run.IN
diff --git a/tests/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN b/tests/parm/c96_HAFS_v0_hwrf.nml.IN
similarity index 100%
rename from tests/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN
rename to tests/parm/c96_HAFS_v0_hwrf.nml.IN
diff --git a/tests/parm/ccpp_ca.nml.IN b/tests/parm/ca.nml.IN
similarity index 100%
rename from tests/parm/ccpp_ca.nml.IN
rename to tests/parm/ca.nml.IN
diff --git a/tests/parm/ccpp_cpt.nml.IN b/tests/parm/ccpp_cpt.nml.IN
deleted file mode 100644
index ccc61c8f06..0000000000
--- a/tests/parm/ccpp_cpt.nml.IN
+++ /dev/null
@@ -1,355 +0,0 @@
-&amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst  = .true.
-       use_ncep_ice  = .false.
-       no_anom_sst   = .false.
-       data_set      = 'reynolds_oi',
-       date_out_of_range = 'climo',
-/
-
-&atmos_model_nml
-       blocksize    = 32
-       chksum_debug = .false.
-       dycore_only  = .false.
-       fdiag        = @[FDIAG]
-       ccpp_suite   = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-       prepend_date = .F.
-/
-
-&fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
-/
-
-&fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 3000000,
-       print_memory_usage = .false.
-/
-
-&fv_grid_nml
-       grid_file = 'INPUT/grid_spec.nc'
-/
-
-&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    = .F.
-       range_warn  = .F.
-       reset_eta   = .F.
-       n_sponge    = @[NPZ]
-       nudge_qv    = .F.
-       tau         = 5.
-       rf_cutoff   = 7.5e2
-       d2_bg_k1    = 0.15
-       d2_bg_k2    = 0.02
-       kord_tm     = -9
-       kord_mt     =  9
-       kord_wz     =  9
-       kord_tr     =  9
-       hydrostatic = .F.
-       phys_hydrostatic   = .F.
-       use_hydro_pressure = .F.
-       beta      = 0.
-       a_imp     = 1.
-       p_fac     = 0.1
-       k_split   = 2
-       n_split   = 6
-       nwat      = 6
-       na_init   = @[NA_INIT]
-       d_ext     = 0.0
-       dnats     = 0
-       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 = .T.
-       gfs_phil = .false.
-       nggps_ic = @[NGGPS_IC]
-       mountain = @[MOUNTAIN]
-       ncep_ic  = .F.
-       d_con    = 1.
-       hord_mt  =  6
-       hord_vt  =  6
-       hord_tm  =  6
-       hord_dp  =  6
-       hord_tr  =  8
-       adjust_dry_mass = .F.
-       consv_te   = 1.
-       do_sat_adj = .T.
-       consv_am   = .F.
-       fill       = .T.
-       dwind_2d   = .F.
-       print_freq = 6
-       warm_start = @[WARM_START]
-       read_increment = @[READ_INCREMENT]
-       res_latlon_dynamics = "fv3_increment.nc"
-       no_dycore  = .false.
-       z_tracer   = .T.
-/
-
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
-&external_ic_nml
-       filtered_terrain = .true.
-       levp       = @[NPZP]
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
-/
-
-&gfs_physics_nml
-       fhzero         = 6.
-       ldiag3d        = .false.
-       fhcyc          = 24.
-       use_ufo        = .true.
-       pre_rad        = .false.
-       crtrh          = 0.93,0.90,0.95
-       ncld           = 2
-       imp_physics    = 10
-       pdfcld         = .false.
-       fhswr          = 3600.
-       fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       IAER           = 111
-       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        = @[HYBEDMF]
-       satmedmf       = @[SATMEDMF]
-       lheatstrg      = @[LHEATSTRG]
-       random_clds    = .true.
-       trans_trac     = .true.
-       cnvcld         = .true.
-       imfshalcnv     = 2
-       imfdeepcnv     = -1
-       cdmbgwd        = 3.5,0.25
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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
-       oz_phys        = .false.
-       oz_phys_2015   = .true.
-       debug          = .false.
-       ras            = .false.
-       cscnv          = .true.
-       do_shoc        = .false.
-       do_aw          = .true.
-       shoc_cld       = .false.
-       h2o_phys       = .true.
-       shcnvcw        = .false.
-       xkzm_h         = 0.5
-       xkzm_m         = 0.5
-       xkzm_s         = 1.0
-       nstf_name      = @[NSTF_NAME]
-       nst_anl        = .true.
-       ccwf           = 1.0,1.0
-       dlqf           = 0.25,0.05
-       mg_dcs         = 200.0
-       mg_ts_auto_ice = 180.0,900.0
-       mg_qcvar       = 1.0
-       fprcp          = 2
-       pdfflag        = 4
-       iccn           = 0
-       mg_do_graupel  = .true.
-       mg_do_hail     = .false.
-       do_sb_physics  = .true.
-       mg_do_ice_gmao = .false.
-       mg_do_liq_liu  = .true.
-       cs_parm        = 8.0,4.0,1.0e3,3.5e3,20.0,1.0,0.0,1.0,0.6,0.0
-       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
-       ctei_rm        = 0.60,0.23
-       max_lon        = 8000
-       max_lat        = 4000
-       rhcmax         = 0.9999999
-       effr_in        = .true.
-       ltaerosol      = .false.
-       lradar         = .false.
-       cplflx         = .false.
-       iau_delthrs    = 6
-       iaufhrs        = 30
-       iau_inc_files  = @[IAU_INC_FILES]
-/
-
-&gfdl_cloud_microphysics_nml
-  sedi_transport = .true.
-  do_sedi_heat = .false.
-  rad_snow = .true.
-  rad_graupel = .true.
-  rad_rain = .true.
-  const_vi = .F.
-  const_vs = .F.
-  const_vg = .F.
-  const_vr = .F.
-  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 = 1500.
-  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.
-/
-
-&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]
-       FNSMCC   = @[FNSMCC]
-       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
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
-/
-&nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
-  SKEBNORM=1,
-  SKEB_NPASS=30,
-  SKEB_VDOF=5,
-  SKEB=@[SKEB],
-  SKEB_TAU=2.16E4,
-  SKEB_LSCALE=1000.E3,
-  SHUM=@[SHUM],
-  SHUM_TAU=21600,
-  SHUM_LSCALE=500000,
-  SPPT=@[SPPT],
-  SPPT_TAU=21600,
-  SPPT_LSCALE=500000,
-  SPPT_LOGIT=.TRUE.,
-  SPPT_SFCLIMIT=.TRUE.,
-  ISEED_SHUM=1,
-  ISEED_SKEB=2,
-  ISEED_SPPT=3,
-/
-&nam_sfcperts
-/
-
-&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 = 0
-       launch_level      = 25
-/
diff --git a/tests/parm/ccpp_csawmg.nml.IN b/tests/parm/ccpp_csawmg.nml.IN
deleted file mode 100644
index 68c3688586..0000000000
--- a/tests/parm/ccpp_csawmg.nml.IN
+++ /dev/null
@@ -1,305 +0,0 @@
-&amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst  = .true.
-       use_ncep_ice  = .false.
-       no_anom_sst   = .false.
-       data_set      = 'reynolds_oi',
-       date_out_of_range = 'climo',
-/
-
-&atmos_model_nml
-       blocksize    = 32
-       chksum_debug = .false.
-       dycore_only  = .false.
-       fdiag        = @[FDIAG]
-       ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-       prepend_date = .F.
-/
-
-&fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
-/
-
-&fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 3000000,
-       print_memory_usage = .false.
-/
-
-&fv_grid_nml
-       grid_file = 'INPUT/grid_spec.nc'
-/
-
-&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    = .F.
-       range_warn  = .F.
-       reset_eta   = .F.
-       n_sponge    = 24
-       nudge_qv    = .F.
-       tau         = 5.
-       rf_cutoff   = 7.5e2
-       d2_bg_k1    = 0.15
-       d2_bg_k2    = 0.02
-       kord_tm     = -9
-       kord_mt     =  9
-       kord_wz     =  9
-       kord_tr     =  9
-       hydrostatic = .F.
-       phys_hydrostatic   = .F.
-       use_hydro_pressure = .F.
-       beta      = 0.
-       a_imp     = 1.
-       p_fac     = 0.1
-       k_split   = 2
-       n_split   = 6
-       nwat      = 6
-       na_init   = @[NA_INIT]
-       d_ext     = 0.0
-       dnats     = 0
-       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 = .T.
-       gfs_phil = .false.
-       nggps_ic = @[NGGPS_IC]
-       mountain = @[MOUNTAIN]
-       ncep_ic  = .F.
-       d_con    = 1.
-       hord_mt  =  6
-       hord_vt  =  6
-       hord_tm  =  6
-       hord_dp  =  6
-       hord_tr  = 13
-       adjust_dry_mass = .F.
-       consv_te   = 1.
-       consv_am   = .F.
-       fill       = .T.
-       dwind_2d   = .F.
-       print_freq = 6
-       warm_start = @[WARM_START]
-       no_dycore  = .false.
-       z_tracer   = .T.
-       read_increment = @[READ_INCREMENT]
-       res_latlon_dynamics = "fv3_increment.nc"
-
-/
-
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
-&external_ic_nml
-       filtered_terrain = .true.
-       levp       = @[NPZP]
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
-/
-
-&gfs_physics_nml
-       fhzero         = 6.
-       ldiag3d        = .false.
-       fhcyc          = 24.
-       nst_anl        = .true.
-       use_ufo        = .true.
-       pre_rad        = .false.
-       crtrh          = 0.93,0.90,0.95
-       ncld           = 2
-       imp_physics    = 10
-       pdfcld         = .false.
-       fhswr          = 3600.
-       fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       IAER           = 111
-       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        = .false.
-       hybedmf        = .true.
-       satmedmf       = .false.
-       lheatstrg      = @[LHEATSTRG]
-       random_clds    = .true.
-       trans_trac     = .true.
-       cnvcld         = .false.
-       imfshalcnv     = 2
-       imfdeepcnv     = -1
-       cdmbgwd        = 3.5,0.25
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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
-       oz_phys        = .false.
-       oz_phys_2015   = .true.
-       debug          = .false.
-
-       ras            = .false.
-       cscnv          = .true.
-       do_shoc        = .false.
-       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
-       do_aw          = .true.
-       shoc_cld       = .false.
-       h2o_phys       = .true.
-       shcnvcw        = .false.
-       xkzm_h         = 0.5
-       xkzm_m         = 0.5
-       xkzm_s         = 1.0
-       ccwf           = 1.0,1.0
-       dlqf           = 0.25,0.05
-       mg_dcs         = 200.0
-       mg_ts_auto_ice = 180.0,900.0
-       mg_qcvar       = 1.0
-       fprcp          = 2
-       pdfflag        = 4
-       iccn           = 1
-       mg_do_graupel  = .true.
-       mg_do_hail     = .false.
-       do_sb_physics  = .true.
-       mg_do_ice_gmao = .false.
-       mg_do_liq_liu  = .true.
-       cs_parm        = 8.0,4.0,1.0e3,3.5e3,20.0,1.0,0.0,1.0,0.6,0.0
-       ctei_rm        = 0.60,0.23
-       max_lon        = 8000
-       max_lat        = 4000
-       rhcmax         = 0.9999999
-       effr_in        = .true.
-
-       nstf_name      = @[NSTF_NAME]
-       iau_delthrs    = 6
-       iaufhrs        = 30
-       iau_inc_files  = @[IAU_INC_FILES]
-/
-
-&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]
-       FNSMCC   = @[FNSMCC]
-       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
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
-/
-&nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
-  SKEBNORM=1,
-  SKEB_NPASS=30,
-  SKEB_VDOF=5,
-  SKEB=@[SKEB],
-  SKEB_TAU=2.16E4,
-  SKEB_LSCALE=1000.E3,
-  SHUM=@[SHUM],
-  SHUM_TAU=21600,
-  SHUM_LSCALE=500000,
-  SPPT=@[SPPT],
-  SPPT_TAU=21600,
-  SPPT_LSCALE=500000,
-  SPPT_LOGIT=.TRUE.,
-  SPPT_SFCLIMIT=.TRUE.,
-  ISEED_SHUM=1,
-  ISEED_SKEB=2,
-  ISEED_SPPT=3,
-/
-&nam_sfcperts
-/
-
-&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 = 0
-       launch_level      = 25
-/
diff --git a/tests/parm/ccpp_csawmg3shoc127.nml.IN b/tests/parm/ccpp_csawmg3shoc127.nml.IN
deleted file mode 100644
index 2f01b488f1..0000000000
--- a/tests/parm/ccpp_csawmg3shoc127.nml.IN
+++ /dev/null
@@ -1,305 +0,0 @@
-&amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst  = .true.
-       use_ncep_ice  = .false.
-       no_anom_sst   = .false.
-       data_set      = 'reynolds_oi',
-       date_out_of_range = 'climo',
-/
-
-&atmos_model_nml
-       blocksize    = 32
-       chksum_debug = .false.
-       dycore_only  = .false.
-       fdiag        = @[FDIAG]
-       ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-       prepend_date = .F.
-/
-
-&fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
-/
-
-&fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 3000000,
-       print_memory_usage = .false.
-/
-
-&fv_grid_nml
-       grid_file = 'INPUT/grid_spec.nc'
-/
-
-&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    = .F.
-       range_warn  = .F.
-       reset_eta   = .F.
-       n_sponge    = @[NPZ]
-       nudge_qv    = .F.
-       tau         = 5.
-       rf_cutoff   = 7.5e2
-       d2_bg_k1    = 0.15
-       d2_bg_k2    = 0.02
-       kord_tm     = -9
-       kord_mt     =  9
-       kord_wz     =  9
-       kord_tr     =  9
-       hydrostatic = .F.
-       phys_hydrostatic   = .F.
-       use_hydro_pressure = .F.
-       beta      = 0.0
-       a_imp     = 1.0
-       p_fac     = 0.1
-       k_split   = 1
-       n_split   = 8
-       nwat      = 6
-       na_init   = @[NA_INIT]
-       d_ext     = 0.0
-       dnats     = 0
-       fv_sg_adj = 450
-       d2_bg     = 0.
-       nord      =  2
-       dddmp     = 0.1
-       d4_bg     = 0.16
-       vtdm4     = 0.02
-       delt_max  = 0.002
-       ke_bg     = 0.
-       do_vort_damp = .true.
-       external_ic  = @[EXTERNAL_IC]
-       external_eta = .T.
-       gfs_phil = .false.
-       nggps_ic = @[NGGPS_IC]
-       mountain = @[MOUNTAIN]
-       ncep_ic  = .F.
-       d_con    = 1.
-       hord_mt  =  6
-       hord_vt  =  6
-       hord_tm  =  6
-       hord_dp  =  6
-       hord_tr  = 13
-       adjust_dry_mass = .F.
-       consv_te   = 1.
-       consv_am   = .F.
-       do_sat_adj = .false.
-       fill       = .T.
-       dwind_2d   = .F.
-       print_freq = 6
-       warm_start = @[WARM_START]
-       no_dycore  = .false.
-       z_tracer   = .T.
-       read_increment = @[READ_INCREMENT]
-       res_latlon_dynamics = "fv3_increment.nc"
-/
-
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
-&external_ic_nml
-       filtered_terrain = .true.
-       levp       = @[NPZP]
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
-/
-
-&gfs_physics_nml
-       fhzero         = 6.
-       ldiag3d        = .false.
-       fhcyc          = 24.
-       nst_anl        = .true.
-       use_ufo        = .true.
-       pre_rad        = .false.
-       crtrh          = 0.98,0.98,0.90
-       ncld           = 2
-       imp_physics    = 10
-       pdfcld         = .false.
-       fhswr          = 3600.
-       fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       IAER           = 111
-       ico2           = 2
-       isubc_sw       = 2
-       isubc_lw       = 2
-       isol           = 2
-       lwhtr          = .true.
-       swhtr          = .true.
-       cnvgwd         = .true.
-       shal_cnv       = .false..
-       cal_pre        = .false.
-       redrag         = .true.
-       dspheat        = .fasle.
-       hybedmf        = .false.
-       satmedmf       = .false.
-       lheatstrg      = @[LHEATSTRG]
-       random_clds    = .true.
-       trans_trac     = .true.
-       cnvcld         = .false.
-       imfshalcnv     = -1
-       imfdeepcnv     = -1
-       cdmbgwd        = 3.5,0.25
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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
-       debug          = .false.
-
-       ras            = .false.
-       cscnv          = .true.
-       do_shoc        = .true.
-       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
-       do_aw          = .true.
-       shoc_cld       = .true.
-       h2o_phys       = .true.
-       shcnvcw        = .false.
-       xkzm_h         = 0.5
-       xkzm_m         = 0.5
-       xkzm_s         = 1.0
-       ccwf           = 1.0,1.0
-       dlqf           = 0.25,0.05
-       mg_dcs         = 200.0
-       mg_ts_auto_ice = 180.0,900.0
-       mg_qcvar       = 1.0
-       fprcp          = 2
-       pdfflag        = 4
-       iccn           = 0
-       mg_do_graupel = .true.
-       mg_do_hail     = .false.
-       do_sb_physics  = .true.
-       mg_do_ice_gmao = .false.
-       mg_do_liq_liu  = .true.
-       cs_parm        = 8.0,4.0,1.0e3,3.5e3,20.0,1.0,0.0,1.0,0.6,0.0
-       ctei_rm        = 0.60,0.23
-       max_lon        = 8000
-       max_lat        = 4000
-       rhcmax         = 0.9999999
-       effr_in        = .true.
-       oz_phys        = .false.
-       oz_phys_2015   = .true.
-
-       nstf_name      = @[NSTF_NAME]
-       iau_delthrs    = 6
-       iaufhrs        = 30
-       iau_inc_files  = @[IAU_INC_FILES]
-/
-
-&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]
-       FNSMCC   = @[FNSMCC]
-       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
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
-/
-&nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
-  SKEBNORM=1,
-  SKEB_NPASS=30,
-  SKEB_VDOF=5,
-  SKEB=@[SKEB],
-  SKEB_TAU=2.16E4,
-  SKEB_LSCALE=1000.E3,
-  SHUM=@[SHUM],
-  SHUM_TAU=21600,
-  SHUM_LSCALE=500000,
-  SPPT=@[SPPT],
-  SPPT_TAU=21600,
-  SPPT_LSCALE=500000,
-  SPPT_LOGIT=.TRUE.,
-  SPPT_SFCLIMIT=.TRUE.,
-  ISEED_SHUM=1,
-  ISEED_SKEB=2,
-  ISEED_SPPT=3,
-/
-&nam_sfcperts
-/
-
-&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 = 0
-       launch_level      = 25
-/
diff --git a/tests/parm/ccpp_csawmgshoc.nml.IN b/tests/parm/ccpp_csawmgshoc.nml.IN
deleted file mode 100644
index 472cbf4da4..0000000000
--- a/tests/parm/ccpp_csawmgshoc.nml.IN
+++ /dev/null
@@ -1,304 +0,0 @@
-&amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst  = .true.
-       use_ncep_ice  = .false.
-       no_anom_sst   = .false.
-       data_set      = 'reynolds_oi',
-       date_out_of_range = 'climo',
-/
-
-&atmos_model_nml
-       blocksize    = 32
-       chksum_debug = .false.
-       dycore_only  = .false.
-       fdiag        = @[FDIAG]
-       ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-       prepend_date = .F.
-/
-
-&fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
-/
-
-&fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 3000000,
-       print_memory_usage = .false.
-/
-
-&fv_grid_nml
-       grid_file = 'INPUT/grid_spec.nc'
-/
-
-&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    = .F.
-       range_warn  = .F.
-       reset_eta   = .F.
-       n_sponge    = 24
-       nudge_qv    = .F.
-       tau         = 5.
-       rf_cutoff   = 7.5e2
-       d2_bg_k1    = 0.15
-       d2_bg_k2    = 0.02
-       kord_tm     = -9
-       kord_mt     =  9
-       kord_wz     =  9
-       kord_tr     =  9
-       hydrostatic = .F.
-       phys_hydrostatic   = .F.
-       use_hydro_pressure = .F.
-       beta      = 0.
-       a_imp     = 1.
-       p_fac     = 0.1
-       k_split   = 2
-       n_split   = 6
-       nwat      = 6
-       na_init   = @[NA_INIT]
-       d_ext     = 0.0
-       dnats     = 0
-       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 = .T.
-       gfs_phil = .false.
-       nggps_ic = @[NGGPS_IC]
-       mountain = @[MOUNTAIN]
-       ncep_ic  = .F.
-       d_con    = 1.
-       hord_mt  =  6
-       hord_vt  =  6
-       hord_tm  =  6
-       hord_dp  =  6
-       hord_tr  = 13
-       adjust_dry_mass = .F.
-       consv_te   = 1.
-       consv_am   = .F.
-       fill       = .T.
-       dwind_2d   = .F.
-       print_freq = 6
-       warm_start = @[WARM_START]
-       no_dycore  = .false.
-       z_tracer   = .T.
-       read_increment = @[READ_INCREMENT]
-       res_latlon_dynamics = "fv3_increment.nc"
-/
-
-#&coupler_nml
-#       months   = 0
-#       days     = 1
-#       hours    = 0
-#       dt_atmos = 225
-#       dt_ocean = 225
-#       current_date =  2016,10,03,00,0,0
-#       calendar = 'julian'
-#       memuse_verbose = .false.
-#       atmos_nthreads = 1
-#       use_hyper_thread = .false.
-#       ncores_per_node = 24
-#/
-
-&external_ic_nml
-       filtered_terrain = .true.
-       levp       = @[NPZP]
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
-/
-
-&gfs_physics_nml
-       fhzero         = 6.
-       ldiag3d        = .false.
-       fhcyc          = 24.
-       nst_anl        = .true.
-       use_ufo        = .true.
-       pre_rad        = .false.
-       crtrh          = 1.00,1.00,0.95
-       ncld           = 2
-       imp_physics    = 10
-       pdfcld         = .false.
-       fhswr          = 3600.
-       fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       IAER           = 111
-       ico2           = 2
-       isubc_sw       = 2
-       isubc_lw       = 2
-       isol           = 2
-       lwhtr          = .true.
-       swhtr          = .true.
-       cnvgwd         = .true.
-       shal_cnv       = .false..
-       cal_pre        = .false.
-       redrag         = .true.
-       dspheat        = .false.
-       hybedmf        = .false.
-       satmedmf       = .false.
-       lheatstrg      = @[LHEATSTRG]
-       random_clds    = .true.
-       trans_trac     = .true.
-       cnvcld         = .false.
-       imfshalcnv     = -1
-       imfdeepcnv     = -1
-       cdmbgwd        = 3.5,0.25
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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
-       debug          = .false.
-
-       ras            = .false.
-       cscnv          = .true.
-       do_shoc        = .true.
-       shoc_parm      = 7000.0,1.0,2.0,0.7,-999.0
-       do_aw          = .true.
-       shoc_cld       = .true.
-       h2o_phys       = .true.
-       shcnvcw        = .false.
-       xkzm_h         = 1.0
-       xkzm_m         = 1.0
-       xkzm_s         = 1.0
-       ccwf           = 1.0,1.0
-       dlqf           = 0.25,0.05
-       mg_dcs         = 200.0
-       mg_ts_auto_ice = 180.0,900.0
-       mg_qcvar       = 1.0
-       fprcp          = 2
-       pdfflag        = 4
-       iccn           = 0
-       mg_do_graupel  = .true.
-       mg_do_hail     = .false.
-       do_sb_physics  = .true.
-       mg_do_ice_gmao = .false.
-       mg_do_liq_liu  = .true.
-       cs_parm        = 8.0,4.0,1.0e3,3.5e3,20.0,1.0,0.0,1.0,0.6,0.0
-       ctei_rm        = 0.60,0.23
-       max_lon        = 8000
-       max_lat        = 4000
-       rhcmax         = 0.9999999
-       effr_in        = .true.
-       oz_phys        = .false.
-       oz_phys_2015   = .true.
-
-       nstf_name      = @[NSTF_NAME]
-       iau_delthrs    = 6
-       iaufhrs        = 30
-       iau_inc_files  = @[IAU_INC_FILES]
-/
-
-&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]
-       FNSMCC   = @[FNSMCC]
-       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
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
-/
-&nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
-  SKEBNORM=1,
-  SKEB_NPASS=30,
-  SKEB_VDOF=5,
-  SKEB=@[SKEB],
-  SKEB_TAU=2.16E4,
-  SKEB_LSCALE=1000.E3,
-  SHUM=@[SHUM],
-  SHUM_TAU=21600,
-  SHUM_LSCALE=500000,
-  SPPT=@[SPPT],
-  SPPT_TAU=21600,
-  SPPT_LSCALE=500000,
-  SPPT_LOGIT=.TRUE.,
-  SPPT_SFCLIMIT=.TRUE.,
-  ISEED_SHUM=1,
-  ISEED_SKEB=2,
-  ISEED_SPPT=3,
-/
-&nam_sfcperts
-/
-
-&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 = 0
-       launch_level      = 25
-/
diff --git a/tests/parm/ccpp_input_nest02.nml.IN b/tests/parm/ccpp_input_nest02.nml.IN
deleted file mode 100644
index 0052e17e74..0000000000
--- a/tests/parm/ccpp_input_nest02.nml.IN
+++ /dev/null
@@ -1,292 +0,0 @@
-&amip_interp_nml
-       interp_oi_sst = .true.
-       use_ncep_sst = .true.
-       use_ncep_ice = .false.
-       no_anom_sst = .false.
-       data_set = 'reynolds_oi',
-       date_out_of_range = 'climo',
-/
-
- &atmos_model_nml
-       blocksize = 24
-       chksum_debug = .false.
-       dycore_only = .false.
-       fdiag = @[FDIAG]
-       ccpp_suite = '@[CCPP_SUITE]'
-/
-
-&diag_manager_nml
-       prepend_date = .F.
-/
-
-&fms_io_nml
-       checksum_required   = .false.
-       max_files_r = 100,
-       max_files_w = 100,
-/
-
-&fms_nml
-       clock_grain = 'ROUTINE',
-       domains_stack_size = 3000000,
-       print_memory_usage = .false.
-/
-
-&fv_grid_nml
-!       grid_file = 'INPUT/grid_spec.nc'
-/
-
-&fv_core_nml
-       layout   = @[INPES_NEST],@[JNPES_NEST]
-       io_layout = 1,1
-       npx      = 211
-       npy      = 193
-       ntiles   = 1,
-       npz    = @[NPZ]
-!       grid_type = -1
-       make_nh = @[MAKE_NH]
-       fv_debug = .F.
-       range_warn = .F.
-       reset_eta = .F.
-       n_sponge = 30
-       nudge_qv = .T.
-       rf_fast = .F.
-       tau = 5.
-       rf_cutoff = 7.5e2
-       d2_bg_k1 = 0.15
-       d2_bg_k2 = 0.02
-       kord_tm = -9
-       kord_mt =  9
-       kord_wz =  9
-       kord_tr =  9
-       hydrostatic = .F.
-       phys_hydrostatic = .F.
-       use_hydro_pressure = .F.
-       beta = 0.
-       a_imp = 1.
-       p_fac = 0.1
-       k_split  = 2
-       n_split  = 6
-       nwat = 6
-       na_init = @[NA_INIT]
-       d_ext = 0.0
-       dnats = 1
-       fv_sg_adj = 600
-       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 = .T.
-       gfs_phil = .false.
-       nggps_ic = @[NGGPS_IC]
-       mountain = @[MOUNTAIN]
-       ncep_ic = .F.
-       d_con = 1.
-       hord_mt =  6
-       hord_vt =  6
-       hord_tm =  6
-       hord_dp =  6
-       hord_tr = 8
-       adjust_dry_mass = .F.
-       consv_te = 0.
-       do_sat_adj = .T.
-       consv_am = .F.
-       fill = .T.
-       dwind_2d = .F.
-       print_freq = 6
-       warm_start = @[WARM_START]
-       read_increment = @[READ_INCREMENT]
-       res_latlon_dynamics = "fv3_increment.nc"
-       no_dycore = .false.
-       z_tracer = .T.
-
-       nested = .true.
-       twowaynest = .true.
-       nestupdate = 7
-
-/
-
-&external_ic_nml
-       filtered_terrain = .true.
-       levp = @[NPZP]
-       gfs_dwinds = .true.
-       checker_tr = .F.
-       nt_checker = 0
-/
-
-&gfs_physics_nml
-       fhzero         = 6.
-       ldiag3d        = .false.
-       fhcyc          = 24.
-       nst_anl        = .true.
-       use_ufo        = .true.
-       pre_rad        = .false.
-       ncld           = 5
-       imp_physics    = 11
-       pdfcld         = .false.
-       fhswr          = 3600.
-       fhlwr          = 3600.
-       ialb           = 1
-       iems           = 1
-       IAER           = 111
-       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        = @[HYBEDMF]
-       satmedmf       = @[SATMEDMF]
-       lheatstrg      = @[LHEATSTRG]
-       random_clds    = .false.
-       trans_trac     = .false.
-       cnvcld         = .true.
-       imfshalcnv     = 2
-       imfdeepcnv     = 2
-       cdmbgwd        = 3.5,0.25
-       prslrd0        = 0.
-       ivegsrc        = 1
-       isot           = 1
-       lsm            = 1
-       iopt_dveg      = 2
-       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
-       debug          = .false.
-       nstf_name      = @[NSTF_NAME]
-       xkzminv        = 0.3
-       xkzm_m         = 1.0
-       xkzm_h         = 1.0
-/
-
-&gfdl_cloud_microphysics_nml
-       sedi_transport = .true.
-       do_sedi_heat = .false.
-       rad_snow = .true.
-       rad_graupel = .true.
-       rad_rain = .true.
-       const_vi = .F.
-       const_vs = .F.
-       const_vg = .F.
-       const_vr = .F.
-       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 = 300.
-       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.
-/
-
-&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   = "global_snowfree_albedo.bosu.t126.384.190.rg.grb",
-       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   = "global_vegtype.igbp.t126.384.190.rg.grb",
-       FNSOTC   = "global_soiltype.statsgo.t126.384.190.rg.grb",
-       FNSMCC   = "global_soilmgldas.t126.384.190.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   = "global_mxsnoalb.uariz.t126.384.190.rg.grb",
-       LDEBUG   =.false.,
-       FSMCL(2) = 99999
-       FSMCL(3) = 99999
-       FSMCL(4) = 99999
-       FTSFS    = 90
-       FAISS    = 99999
-       FSNOL    = 99999
-       FSICL    = 99999
-       FTSFL    = 99999,
-       FAISL    = 99999,
-       FVETL    = 99999,
-       FSOTL    = 99999,
-       FvmnL    = 99999,
-       FvmxL    = 99999,
-       FSLPL    = 99999,
-       FABSL    = 99999,
-       FSNOS    = 99999,
-       FSICS    = 99999,
-/
-&nam_stochy
-/
-&nam_sfcperts
-/
-
-&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 = 0
-       launch_level      = 25
-/
diff --git a/tests/parm/ccpp_control.nml.IN b/tests/parm/control.nml.IN
similarity index 100%
rename from tests/parm/ccpp_control.nml.IN
rename to tests/parm/control.nml.IN
diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
index 6f05ac8223..ccc61c8f06 100644
--- a/tests/parm/cpt.nml.IN
+++ b/tests/parm/cpt.nml.IN
@@ -12,6 +12,7 @@
        chksum_debug = .false.
        dycore_only  = .false.
        fdiag        = @[FDIAG]
+       ccpp_suite   = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -176,6 +177,8 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
        debug          = .false.
        ras            = .false.
        cscnv          = .true.
diff --git a/tests/parm/csawmg.nml.IN b/tests/parm/csawmg.nml.IN
index 09b9ce71ce..68c3688586 100644
--- a/tests/parm/csawmg.nml.IN
+++ b/tests/parm/csawmg.nml.IN
@@ -12,6 +12,7 @@
        chksum_debug = .false.
        dycore_only  = .false.
        fdiag        = @[FDIAG]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -152,7 +153,7 @@
        cal_pre        = .false.
        redrag         = .true.
        dspheat        = .false.
-       hybedmf        = @[HYBEDMF]
+       hybedmf        = .true.
        satmedmf       = .false.
        lheatstrg      = @[LHEATSTRG]
        random_clds    = .true.
@@ -177,6 +178,8 @@
        iopt_snf       = 4
        iopt_tbot      = 2
        iopt_stc       = 1
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
        debug          = .false.
 
        ras            = .false.
diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
index 4eff370829..2f01b488f1 100644
--- a/tests/parm/csawmg3shoc127.nml.IN
+++ b/tests/parm/csawmg3shoc127.nml.IN
@@ -12,6 +12,7 @@
        chksum_debug = .false.
        dycore_only  = .false.
        fdiag        = @[FDIAG]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -152,7 +153,7 @@
        cal_pre        = .false.
        redrag         = .true.
        dspheat        = .fasle.
-       hybedmf        = @[HYBEDMF]
+       hybedmf        = .false.
        satmedmf       = .false.
        lheatstrg      = @[LHEATSTRG]
        random_clds    = .true.
@@ -198,7 +199,7 @@
        fprcp          = 2
        pdfflag        = 4
        iccn           = 0
-       mg_do_graupel  = .true.
+       mg_do_graupel = .true.
        mg_do_hail     = .false.
        do_sb_physics  = .true.
        mg_do_ice_gmao = .false.
@@ -209,6 +210,8 @@
        max_lat        = 4000
        rhcmax         = 0.9999999
        effr_in        = .true.
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
 
        nstf_name      = @[NSTF_NAME]
        iau_delthrs    = 6
diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
index c6c44b1d2f..472cbf4da4 100644
--- a/tests/parm/csawmgshoc.nml.IN
+++ b/tests/parm/csawmgshoc.nml.IN
@@ -12,6 +12,7 @@
        chksum_debug = .false.
        dycore_only  = .false.
        fdiag        = @[FDIAG]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -151,7 +152,7 @@
        cal_pre        = .false.
        redrag         = .true.
        dspheat        = .false.
-       hybedmf        = @[HYBEDMF]
+       hybedmf        = .false.
        satmedmf       = .false.
        lheatstrg      = @[LHEATSTRG]
        random_clds    = .true.
@@ -208,6 +209,8 @@
        max_lat        = 4000
        rhcmax         = 0.9999999
        effr_in        = .true.
+       oz_phys        = .false.
+       oz_phys_2015   = .true.
 
        nstf_name      = @[NSTF_NAME]
        iau_delthrs    = 6
diff --git a/tests/parm/ccpp_esg_HAFS_v0_hwrf-model_configure.IN b/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
similarity index 100%
rename from tests/parm/ccpp_esg_HAFS_v0_hwrf-model_configure.IN
rename to tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
diff --git a/tests/parm/ccpp_esg_HAFS_v0_hwrf.nml.IN b/tests/parm/esg_HAFS_v0_hwrf.nml.IN
similarity index 100%
rename from tests/parm/ccpp_esg_HAFS_v0_hwrf.nml.IN
rename to tests/parm/esg_HAFS_v0_hwrf.nml.IN
diff --git a/tests/parm/ccpp_gfdlmp.nml.IN b/tests/parm/gfdlmp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_gfdlmp.nml.IN
rename to tests/parm/gfdlmp.nml.IN
diff --git a/tests/parm/ccpp_gfsv16_csawmg.nml.IN b/tests/parm/gfsv16_csawmg.nml.IN
similarity index 100%
rename from tests/parm/ccpp_gfsv16_csawmg.nml.IN
rename to tests/parm/gfsv16_csawmg.nml.IN
diff --git a/tests/parm/ccpp.gocart.nml.IN b/tests/parm/gocart.nml.IN
similarity index 100%
rename from tests/parm/ccpp.gocart.nml.IN
rename to tests/parm/gocart.nml.IN
diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/gsd.nml.IN
similarity index 100%
rename from tests/parm/ccpp_gsd.nml.IN
rename to tests/parm/gsd.nml.IN
diff --git a/tests/parm/ccpp_gsd_rrtmgp.nml.IN b/tests/parm/gsd_rrtmgp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_gsd_rrtmgp.nml.IN
rename to tests/parm/gsd_rrtmgp.nml.IN
diff --git a/tests/parm/ccpp_gsd_sar-model_configure.IN b/tests/parm/gsd_sar-model_configure.IN
similarity index 100%
rename from tests/parm/ccpp_gsd_sar-model_configure.IN
rename to tests/parm/gsd_sar-model_configure.IN
diff --git a/tests/parm/ccpp_gsd_sar.nml.IN b/tests/parm/gsd_sar.nml.IN
similarity index 100%
rename from tests/parm/ccpp_gsd_sar.nml.IN
rename to tests/parm/gsd_sar.nml.IN
diff --git a/tests/parm/input_nest02.nml.IN b/tests/parm/input_nest02.nml.IN
index fdefdf3ae2..0052e17e74 100644
--- a/tests/parm/input_nest02.nml.IN
+++ b/tests/parm/input_nest02.nml.IN
@@ -7,11 +7,12 @@
        date_out_of_range = 'climo',
 /
 
-&atmos_model_nml
+ &atmos_model_nml
        blocksize = 24
        chksum_debug = .false.
        dycore_only = .false.
        fdiag = @[FDIAG]
+       ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
diff --git a/tests/parm/ccpp_lndp.nml.IN b/tests/parm/lndp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_lndp.nml.IN
rename to tests/parm/lndp.nml.IN
diff --git a/tests/parm/ccpp_multi_gases.nml.IN b/tests/parm/multi_gases.nml.IN
similarity index 100%
rename from tests/parm/ccpp_multi_gases.nml.IN
rename to tests/parm/multi_gases.nml.IN
diff --git a/tests/parm/ccpp_regional.nml.IN b/tests/parm/regional.nml.IN
similarity index 100%
rename from tests/parm/ccpp_regional.nml.IN
rename to tests/parm/regional.nml.IN
diff --git a/tests/parm/ccpp_regional_c768.nml.IN b/tests/parm/regional_c768.nml.IN
similarity index 100%
rename from tests/parm/ccpp_regional_c768.nml.IN
rename to tests/parm/regional_c768.nml.IN
diff --git a/tests/parm/ccpp_stretched-input.nml.IN b/tests/parm/stretched-input.nml.IN
similarity index 100%
rename from tests/parm/ccpp_stretched-input.nml.IN
rename to tests/parm/stretched-input.nml.IN
diff --git a/tests/parm/ccpp_stretched-nest-input.nml.IN b/tests/parm/stretched-nest-input.nml.IN
similarity index 100%
rename from tests/parm/ccpp_stretched-nest-input.nml.IN
rename to tests/parm/stretched-nest-input.nml.IN
diff --git a/tests/parm/ccpp_v15p2_c96.nml.IN b/tests/parm/v15p2_c96.nml.IN
similarity index 97%
rename from tests/parm/ccpp_v15p2_c96.nml.IN
rename to tests/parm/v15p2_c96.nml.IN
index 5f74b926ab..e9394db3f9 100644
--- a/tests/parm/ccpp_v15p2_c96.nml.IN
+++ b/tests/parm/v15p2_c96.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v15p2'
+  ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -144,8 +144,9 @@
   random_clds  = .false.
   trans_trac   = .true.
   cnvcld       = .true.
-  imfshalcnv   = 2
-  imfdeepcnv   = 2
+  imfshalcnv   = @[IMFSHALCNV]
+  imfdeepcnv   = @[IMFDEEPCNV]
+  ras          = @[RAS]
   cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
@@ -162,8 +163,8 @@
   do_sppt      = .true.
   do_shum      = .true.
   do_skeb      = .true.
-       lndp_type      = @[LNDP_TYPE]
-       n_var_lndp     = @[N_VAR_LNDP]
+  lndp_type    = @[LNDP_TYPE]
+  n_var_lndp   = @[N_VAR_LNDP]
 /
 
 &gfdl_cloud_microphysics_nml
diff --git a/tests/parm/ccpp_v15p2_c96_rrtmgp.nml.IN b/tests/parm/v15p2_c96_rrtmgp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_v15p2_c96_rrtmgp.nml.IN
rename to tests/parm/v15p2_c96_rrtmgp.nml.IN
diff --git a/tests/parm/ccpp_v16_c192L127_rrtmgp.nml.IN b/tests/parm/v16_c192L127_rrtmgp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_v16_c192L127_rrtmgp.nml.IN
rename to tests/parm/v16_c192L127_rrtmgp.nml.IN
diff --git a/tests/parm/ccpp_v16_c96.nml.IN b/tests/parm/v16_c96.nml.IN
similarity index 98%
rename from tests/parm/ccpp_v16_c96.nml.IN
rename to tests/parm/v16_c96.nml.IN
index eb5dba4786..95c136ccdd 100644
--- a/tests/parm/ccpp_v16_c96.nml.IN
+++ b/tests/parm/v16_c96.nml.IN
@@ -16,7 +16,7 @@
   fhout = 3
   fhmaxhf = 120
   fhouthf = 1
-  ccpp_suite = 'FV3_GFS_v16'
+  ccpp_suite = '@[CCPP_SUITE]'
 /
 
 &diag_manager_nml
@@ -154,8 +154,9 @@ deflate_level=1
   random_clds  = .false.
   trans_trac   = .true.
   cnvcld       = .true.
-  imfshalcnv   = 2
-  imfdeepcnv   = 2
+  imfshalcnv   = @[IMFSHALCNV]
+  imfdeepcnv   = @[IMFDEEPCNV]
+  ras          = @[RAS]
   cdmbgwd      = 0.14,1.8,1.0,1.0
   prslrd0      = 0.
   ivegsrc      = 1
diff --git a/tests/parm/ccpp_v16_c96_rrtmgp.nml.IN b/tests/parm/v16_c96_rrtmgp.nml.IN
similarity index 100%
rename from tests/parm/ccpp_v16_c96_rrtmgp.nml.IN
rename to tests/parm/v16_c96_rrtmgp.nml.IN
diff --git a/tests/parm/ccpp_v16_c96_ugwpv1.nml.IN b/tests/parm/v16_c96_ugwpv1.nml.IN
similarity index 100%
rename from tests/parm/ccpp_v16_c96_ugwpv1.nml.IN
rename to tests/parm/v16_c96_ugwpv1.nml.IN
diff --git a/tests/parm/ccpp_v16_flake_c96.nml.IN b/tests/parm/v16_flake_c96.nml.IN
similarity index 100%
rename from tests/parm/ccpp_v16_flake_c96.nml.IN
rename to tests/parm/v16_flake_c96.nml.IN
diff --git a/tests/rt.conf b/tests/rt.conf
index 0c596e9aa1..a4e120fa44 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -4,161 +4,161 @@
 
 COMPILE | SUITES=FV3_GFS_2017                                                                                                     |                                         | fv3 |
 
-RUN     | fv3_ccpp_control                                                                                                        |                                         | fv3 |
-RUN     | fv3_ccpp_decomp                                                                                                         | - jet.intel                             |     |
-RUN     | fv3_ccpp_2threads                                                                                                       |                                         |     |
-RUN     | fv3_ccpp_restart                                                                                                        |                                         |     | fv3_ccpp_control
-RUN     | fv3_ccpp_read_inc                                                                                                       |                                         | fv3 | fv3_ccpp_control
-RUN     | fv3_ccpp_wrtGauss_netcdf_esmf                                                                                           |                                         | fv3 |
-RUN     | fv3_ccpp_wrtGauss_netcdf                                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_wrtGauss_netcdf_parallel                                                                                       |                                         | fv3 |
-RUN     | fv3_ccpp_wrtGlatlon_netcdf                                                                                              |                                         | fv3 |
-RUN     | fv3_ccpp_wrtGauss_nemsio                                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_wrtGauss_nemsio_c192                                                                                           |                                         | fv3 |
-RUN     | fv3_ccpp_stochy                                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_ca                                                                                                             |                                         | fv3 |
-RUN     | fv3_ccpp_lndp                                                                                                           |                                         | fv3 |
+RUN     | fv3_control                                                                                                             |                                         | fv3 |
+RUN     | fv3_decomp                                                                                                              | - jet.intel                             |     |
+RUN     | fv3_2threads                                                                                                            |                                         |     |
+RUN     | fv3_restart                                                                                                             |                                         |     | fv3_control
+RUN     | fv3_read_inc                                                                                                            |                                         | fv3 | fv3_control
+RUN     | fv3_wrtGauss_netcdf_esmf                                                                                                |                                         | fv3 |
+RUN     | fv3_wrtGauss_netcdf                                                                                                     |                                         | fv3 |
+RUN     | fv3_wrtGauss_netcdf_parallel                                                                                            |                                         | fv3 |
+RUN     | fv3_wrtGlatlon_netcdf                                                                                                   |                                         | fv3 |
+RUN     | fv3_wrtGauss_nemsio                                                                                                     |                                         | fv3 |
+RUN     | fv3_wrtGauss_nemsio_c192                                                                                                |                                         | fv3 |
+RUN     | fv3_stochy                                                                                                              |                                         | fv3 |
+RUN     | fv3_ca                                                                                                                  |                                         | fv3 |
+RUN     | fv3_lndp                                                                                                                |                                         | fv3 |
 # temporarily disabled for gaea.intel (intel18): gives different results when creating baseline and verifying against it
-RUN     | fv3_ccpp_iau                                                                                                            |                                         | fv3 | fv3_ccpp_control
-RUN     | fv3_ccpp_lheatstrg                                                                                                      |                                         | fv3 |
+RUN     | fv3_iau                                                                                                                 |                                         | fv3 | fv3_control
+RUN     | fv3_lheatstrg                                                                                                           |                                         | fv3 |
 
 # WW3 not working on Cheyenne in the past, need to check if it works now
 COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y                                                                           | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
-RUN     | fv3_ccpp_gfdlmprad                                                                                                      | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
-RUN     | fv3_ccpp_gfdlmprad_atmwav                                                                                               | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
-RUN     | fv3_ccpp_wrtGauss_nemsio_c768                                                                                           | +               hera.intel orion.intel  | fv3 |
+RUN     | fv3_gfdlmprad                                                                                                           | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
+RUN     | fv3_gfdlmprad_atmwav                                                                                                    | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
+RUN     | fv3_wrtGauss_nemsio_c768                                                                                                | +               hera.intel orion.intel  | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                        |                                         | fv3 |
-RUN     | fv3_ccpp_multigases                                                                                                     |                                         | fv3 |
+# Run multigases test in REPRO mode to avoid numerical instability in the deep atmosphere
+COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y                                                                |                                         | fv3 |
+RUN     | fv3_multigases                                                                                                          |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y                                                                      |                                         | fv3 |
-RUN     | fv3_ccpp_control_32bit                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_stretched                                                                                                      |                                         | fv3 |
-RUN     | fv3_ccpp_stretched_nest                                                                                                 |                                         | fv3 |
+RUN     | fv3_control_32bit                                                                                                       |                                         | fv3 |
+RUN     | fv3_stretched                                                                                                           |                                         | fv3 |
+RUN     | fv3_stretched_nest                                                                                                      |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_regional_control                                                                                               |                                         | fv3 |
-RUN     | fv3_ccpp_regional_restart                                                                                               |                                         | fv3 | fv3_ccpp_regional_control
-RUN     | fv3_ccpp_regional_quilt                                                                                                 |                                         | fv3 |
-RUN     | fv3_ccpp_regional_quilt_hafs                                                                                            |                                         | fv3 |
-RUN     | fv3_ccpp_regional_quilt_netcdf_parallel                                                                                 |                                         | fv3 |
-#RUN     | fv3_ccpp_regional_c768                                                                                                 | wcoss_dell_p3                           | fv3 |
-#RUN     | fv3_ccpp_regional_c768                                                                                                 | hera.intel                              | fv3 |
-#RUN     | fv3_ccpp_regional_c768                                                                                                 | gaea.intel                              | fv3 |
-#RUN     | fv3_ccpp_regional_c768                                                                                                 | jet.intel                               | fv3 |
-#RUN     | fv3_ccpp_regional_c768                                                                                                 | orion.intel                             | fv3 |
+RUN     | fv3_regional_control                                                                                                    |                                         | fv3 |
+RUN     | fv3_regional_restart                                                                                                    |                                         | fv3 | fv3_regional_control
+RUN     | fv3_regional_quilt                                                                                                      |                                         | fv3 |
+RUN     | fv3_regional_quilt_hafs                                                                                                 |                                         | fv3 |
+RUN     | fv3_regional_quilt_netcdf_parallel                                                                                      |                                         | fv3 |
+#RUN     | fv3_regional_c768                                                                                                      | wcoss_dell_p3                           | fv3 |
+#RUN     | fv3_regional_c768                                                                                                      | hera.intel                              | fv3 |
+#RUN     | fv3_regional_c768                                                                                                      | gaea.intel                              | fv3 |
+#RUN     | fv3_regional_c768                                                                                                      | jet.intel                               | fv3 |
+#RUN     | fv3_regional_c768                                                                                                      | orion.intel                             | fv3 |
 
 COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                                   |                                         | fv3 |
-RUN     | fv3_ccpp_gfdlmp                                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_gfdlmprad_gwd                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_gfdlmprad_noahmp                                                                                               |                                         | fv3 |
+RUN     | fv3_gfdlmp                                                                                                              |                                         | fv3 |
+RUN     | fv3_gfdlmprad_gwd                                                                                                       |                                         | fv3 |
+RUN     | fv3_gfdlmprad_noahmp                                                                                                    |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         |                                         | fv3 |
-#RUN     | fv3_ccpp_csawmgshoc                                                                                                    |                                         | fv3 |
-#RUN     | fv3_ccpp_csawmg3shoc127                                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_csawmg                                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_satmedmf                                                                                                       |                                         | fv3 |
-RUN     | fv3_ccpp_satmedmfq                                                                                                      |                                         | fv3 |
+#RUN     | fv3_csawmgshoc                                                                                                         |                                         | fv3 |
+#RUN     | fv3_csawmg3shoc127                                                                                                     |                                         | fv3 |
+RUN     | fv3_csawmg                                                                                                              |                                         | fv3 |
+RUN     | fv3_satmedmf                                                                                                            |                                         | fv3 |
+RUN     | fv3_satmedmfq                                                                                                           |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y          |                                         | fv3 |
-RUN     | fv3_ccpp_gfdlmp_32bit                                                                                                   |                                         | fv3 |
-RUN     | fv3_ccpp_gfdlmprad_32bit_post                                                                                           |                                         | fv3 |
-RUN     | fv3_ccpp_cpt                                                                                                            |                                         | fv3 |
-RUN     | fv3_ccpp_gsd                                                                                                            |                                         | fv3 |
+RUN     | fv3_gfdlmp_32bit                                                                                                        |                                         | fv3 |
+RUN     | fv3_gfdlmprad_32bit_post                                                                                                |                                         | fv3 |
+RUN     | fv3_cpt                                                                                                                 |                                         | fv3 |
+RUN     | fv3_gsd                                                                                                                 |                                         | fv3 |
 # These two tests crash with NaNs on jet.intel
-RUN     | fv3_ccpp_rap                                                                                                            | - jet.intel                             | fv3 |
-RUN     | fv3_ccpp_hrrr                                                                                                           | - jet.intel                             | fv3 |
-RUN     | fv3_ccpp_thompson                                                                                                       |                                         | fv3 |
-RUN     | fv3_ccpp_thompson_no_aero                                                                                               |                                         | fv3 |
+RUN     | fv3_rap                                                                                                                 | - jet.intel                             | fv3 |
+RUN     | fv3_hrrr                                                                                                                | - jet.intel                             | fv3 |
+RUN     | fv3_thompson                                                                                                            |                                         | fv3 |
+RUN     | fv3_thompson_no_aero                                                                                                    |                                         | fv3 |
 # This test crashes with NaNs on jet.intel
-RUN     | fv3_ccpp_rrfs_v1beta                                                                                                    | - jet.intel                             | fv3 |
+RUN     | fv3_rrfs_v1beta                                                                                                         | - jet.intel                             | fv3 |
 
 COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                                                |                                         | fv3 |
-# fv3_ccpp_gfs_v15p2 and fv3_ccpp_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
-RUN     | fv3_ccpp_gfs_v15p2                                                                                                      | - cheyenne.intel                        | fv3 |
-RUN     | fv3_ccpp_gfs_v16                                                                                                        |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_restart                                                                                                |                                         |     | fv3_ccpp_gfs_v16
-RUN     | fv3_ccpp_gfs_v16_stochy                                                                                                 |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                               |  - cheyenne.intel                       | fv3 |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP                                                                                                 |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP_c192L127                                                                                        |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP_2thrd                                                                                           |                                         | fv3 |
+# fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
+RUN     | fv3_gfs_v15p2                                                                                                           | - cheyenne.intel                        | fv3 |
+RUN     | fv3_gfs_v16                                                                                                             |                                         | fv3 |
+RUN     | fv3_gfs_v16_restart                                                                                                     |                                         |     | fv3_gfs_v16
+RUN     | fv3_gfs_v16_stochy                                                                                                      |                                         | fv3 |
+RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |  - cheyenne.intel                       | fv3 |
+RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                                         | fv3 |
+RUN     | fv3_gfs_v16_RRTMGP_c192L127                                                                                             |                                         | fv3 |
+RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_v16_csawmg                                                                                               |                                         | fv3 |
-# fv3_ccpp_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests
-RUN     | fv3_ccpp_gfsv16_csawmg                                                                                                  | - cheyenne.intel                        | fv3 |
-RUN     | fv3_ccpp_gfsv16_csawmgt                                                                                                 | - cheyenne.intel                        | fv3 |
+# fv3_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests
+RUN     | fv3_gfsv16_csawmg                                                                                                       | - cheyenne.intel                        | fv3 |
+RUN     | fv3_gfsv16_csawmgt                                                                                                      | - cheyenne.intel                        | fv3 |
 
 COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake                                                 |                                         | fv3 |
-RUN     | fv3_ccpp_gocart_clm                                                                                                     |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_flake                                                                                                  |                                         | fv3 |
+RUN     | fv3_gocart_clm                                                                                                          |                                         | fv3 |
+RUN     | fv3_gfs_v16_flake                                                                                                       |                                         | fv3 |
 
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1                                                           |                                         | fv3 |
-RUN     | fv3_ccpp_HAFS_v0_hwrf_thompson                                                                                          |                                         | fv3 |
-#RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson                                                                                      |                                         | fv3 |
-RUN     | fv3_ccpp_gfsv16_ugwpv1                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_gfsv16_ugwpv1_warmstart                                                                                        |                                         | fv3 |
+COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                           |                                         | fv3 |
+RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                                         | fv3 |
+#RUN     | fv3_HAFS_v0_hwrf                                                                                                       |                                         | fv3 |
+RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                                         | fv3 |
+RUN     | fv3_gfsv16_ugwpv1                                                                                                       |                                         | fv3 |
+RUN     | fv3_gfsv16_ugwpv1_warmstart                                                                                             |                                         | fv3 |
+RUN     | fv3_gfs_v16_ras                                                                                                         |                                         | fv3 |
 
 ###################################################################################################################################################################################
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-# Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
-# Note: weird bug on Cheyenne, compiling without SUITES=... works fine on the login nodes, but crashes on the compute nodes; same issues on wcoss_cray and wcoss_dell_p3
-COMPILE | DEBUG=Y                                                                                                    | - gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
-COMPILE | DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                           | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
-RUN     | fv3_ccpp_gfs_v15p2_debug                                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_debug                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP_debug                                                                                           |                                         | fv3 |
+COMPILE | DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                        |                                         | fv3 |
+RUN     | fv3_gfs_v15p2_debug                                                                                                     |                                         | fv3 |
+RUN     | fv3_gfs_v16_debug                                                                                                       |                                         | fv3 |
+RUN     | fv3_gfs_v15p2_RRTMGP_debug                                                                                              |                                         | fv3 |
+RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                                         | fv3 |
 
 COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y |                            | fv3 |
-RUN     | fv3_ccpp_regional_control_debug                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_control_debug                                                                                                  |                                         | fv3 |
-RUN     | fv3_ccpp_stretched_nest_debug                                                                                           |                                         | fv3 |
-RUN     | fv3_ccpp_gsd_debug                                                                                                      |                                         | fv3 |
-RUN     | fv3_ccpp_gsd_diag3d_debug                                                                                               |                                         | fv3 |
-RUN     | fv3_ccpp_thompson_debug                                                                                                 |                                         | fv3 |
-RUN     | fv3_ccpp_thompson_no_aero_debug                                                                                         |                                         | fv3 |
-RUN     | fv3_ccpp_rrfs_v1beta_debug                                                                                              |                                         | fv3 |
-
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 DEBUG=Y                                                   |                                         | fv3 |
-RUN     | fv3_ccpp_HAFS_v0_hwrf_thompson_debug                                                                                    |                                         | fv3 |
-#RUN     | fv3_ccpp_HAFS_v0_hwrf_debug                                                                                            |                                         | fv3 |
-RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug                                                                                |                                         | fv3 |
-RUN     | fv3_ccpp_gfsv16_ugwpv1_debug                                                                                            |                                         | fv3 |
+RUN     | fv3_regional_control_debug                                                                                              |                                         | fv3 |
+RUN     | fv3_control_debug                                                                                                       |                                         | fv3 |
+RUN     | fv3_stretched_nest_debug                                                                                                |                                         | fv3 |
+RUN     | fv3_gsd_debug                                                                                                           |                                         | fv3 |
+RUN     | fv3_gsd_diag3d_debug                                                                                                    |                                         | fv3 |
+RUN     | fv3_thompson_debug                                                                                                      |                                         | fv3 |
+RUN     | fv3_thompson_no_aero_debug                                                                                              |                                         | fv3 |
+RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                                         | fv3 |
+
+COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                                   |                                         | fv3 |
+RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                                         | fv3 |
+#RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                 |                                         | fv3 |
+RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                                         | fv3 |
+RUN     | fv3_gfsv16_ugwpv1_debug                                                                                                 |                                         | fv3 |
+RUN     | fv3_gfs_v16_ras_debug                                                                                                   |                                         | fv3 |
 
 ###################################################################################################################################################################################
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y               | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel       |     | cpld_control
-RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray jet.intel       |     | cpld_controlfrac
+COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y               | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel                  |     | cpld_control
+RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray jet.intel                  |     | cpld_controlfrac
 
-RUN     | cpld_2threads                                                                                                           | - wcoss_cray jet.intel       |     |
-RUN     | cpld_decomp                                                                                                             | - wcoss_cray jet.intel       |     |
-RUN     | cpld_satmedmf                                                                                                           | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_ca                                                                                                                 | - wcoss_cray jet.intel       | fv3 |
+RUN     | cpld_2threads                                                                                                           | - wcoss_cray jet.intel                  |     |
+RUN     | cpld_decomp                                                                                                             | - wcoss_cray jet.intel                  |     |
+RUN     | cpld_satmedmf                                                                                                           | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_ca                                                                                                                 | - wcoss_cray jet.intel                  | fv3 |
 
 #12h/36h/48h restart tests
-RUN     | cpld_control_c192                                                                                                       | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restart_c192                                                                                                       | - wcoss_cray jet.intel       |     | cpld_control_c192
-RUN     | cpld_controlfrac_c192                                                                                                   | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restartfrac_c192                                                                                                   | - wcoss_cray jet.intel       |     | cpld_controlfrac_c192
+RUN     | cpld_control_c192                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restart_c192                                                                                                       | - wcoss_cray jet.intel                  |     | cpld_control_c192
+RUN     | cpld_controlfrac_c192                                                                                                   | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restartfrac_c192                                                                                                   | - wcoss_cray jet.intel                  |     | cpld_controlfrac_c192
 
-RUN     | cpld_control_c384                                                                                                       | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restart_c384                                                                                                       | - wcoss_cray jet.intel       |     | cpld_control_c384
-RUN     | cpld_controlfrac_c384                                                                                                   | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restartfrac_c384                                                                                                   | - wcoss_cray jet.intel       |     | cpld_controlfrac_c384
+RUN     | cpld_control_c384                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restart_c384                                                                                                       | - wcoss_cray jet.intel                  |     | cpld_control_c384
+RUN     | cpld_controlfrac_c384                                                                                                   | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restartfrac_c384                                                                                                   | - wcoss_cray jet.intel                  |     | cpld_controlfrac_c384
 
-RUN     | cpld_bmark                                                                                                              | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restart_bmark                                                                                                      | - wcoss_cray jet.intel       |     | cpld_bmark
-RUN     | cpld_bmarkfrac                                                                                                          | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_restart_bmarkfrac                                                                                                  | - wcoss_cray jet.intel       |     | cpld_bmarkfrac
+RUN     | cpld_bmark                                                                                                              | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restart_bmark                                                                                                      | - wcoss_cray jet.intel                  |     | cpld_bmark
+RUN     | cpld_bmarkfrac                                                                                                          | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_restart_bmarkfrac                                                                                                  | - wcoss_cray jet.intel                  |     | cpld_bmarkfrac
 
 #6h/6h/12h restart test
 # test fails on gaea with esmfpio error
@@ -171,24 +171,24 @@ RUN     | cpld_bmarkfrac_wave
 RUN     | cpld_bmarkfrac_wave_v16                                                                                                 | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_control_wave                                                                                                       | - wcoss_cray gaea.intel jet.intel       | fv3 |
 
-COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y       | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_debug                                                                                                              | - wcoss_cray jet.intel       | fv3 |
-RUN     | cpld_debugfrac                                                                                                          | - wcoss_cray jet.intel       | fv3 |
+COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y       | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_debug                                                                                                              | - wcoss_cray jet.intel                  | fv3 |
+RUN     | cpld_debugfrac                                                                                                          | - wcoss_cray jet.intel                  | fv3 |
 
 ###################################################################################################################################################################################
 # Data Atmosphere tests                                                                                                                                                           #
 ###################################################################################################################################################################################
 
-COMPILE | DATM=Y S2S=Y                                                                                                            | - wcoss_cray jet.intel       | fv3 |
-RUN     | datm_control_cfsr                                                                                                       | - wcoss_cray jet.intel       | fv3 |
-RUN     | datm_restart_cfsr                                                                                                       | - wcoss_cray jet.intel       |     | datm_control_cfsr
-RUN     | datm_control_gefs                                                                                                       | - wcoss_cray jet.intel       | fv3 |
+COMPILE | DATM=Y S2S=Y                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
+RUN     | datm_control_cfsr                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
+RUN     | datm_restart_cfsr                                                                                                       | - wcoss_cray jet.intel                  |     | datm_control_cfsr
+RUN     | datm_control_gefs                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
 
-RUN     | datm_bulk_cfsr                                                                                                          | - wcoss_cray jet.intel       | fv3 |
-RUN     | datm_bulk_gefs                                                                                                          | - wcoss_cray jet.intel       | fv3 |
+RUN     | datm_bulk_cfsr                                                                                                          | - wcoss_cray jet.intel                  | fv3 |
+RUN     | datm_bulk_gefs                                                                                                          | - wcoss_cray jet.intel                  | fv3 |
 
-RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray jet.intel gaea.intel      | fv3 |
-RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray jet.intel       | fv3 |
+RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray jet.intel gaea.intel       | fv3 |
+RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray jet.intel                  | fv3 |
 
-COMPILE | DATM=Y S2S=Y DEBUG=Y                                                                                                    | - wcoss_cray jet.intel       | fv3 |
-RUN     | datm_debug_cfsr                                                                                                         | - wcoss_cray jet.intel       | fv3 |
+COMPILE | DATM=Y S2S=Y DEBUG=Y                                                                                                    | - wcoss_cray jet.intel                  | fv3 |
+RUN     | datm_debug_cfsr                                                                                                         | - wcoss_cray jet.intel                  | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
index 90879ab31e..90a0532faf 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -415,9 +415,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210309/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210316/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210309}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210316}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}
@@ -632,8 +632,8 @@ EOF
       RT_SUFFIX="_repro"
       BL_SUFFIX="_repro"
     else
-      RT_SUFFIX="_prod"
-      BL_SUFFIX="_ccpp"
+      RT_SUFFIX=""
+      BL_SUFFIX=""
     fi
 
     if [[ ${MAKE_OPT^^} =~ "WW3=Y" ]]; then
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index e6821e3cb6..23ea04488f 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -3,31 +3,30 @@
 ##################################################################################################################################################################
 
 COMPILE | SUITES=FV3_GFS_2017_gfdlmp                                                                                              |                | fv3         |
-RUN     | fv3_ccpp_gfdlmp                                                                                                         |                | fv3         |
+RUN     | fv3_gfdlmp                                                                                                              |                | fv3         |
 
 COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                              |                | fv3         |
-
-RUN     | fv3_ccpp_gfs_v15p2                                                                                                      |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16                                                                                                        |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16_restart                                                                                                |                |             | fv3_ccpp_gfs_v16
-RUN     | fv3_ccpp_gfs_v16_stochy                                                                                                 |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16_flake                                                                                                  |                | fv3         |
-RUN     | fv3_ccpp_gfs_v15p2_RRTMGP                                                                                               |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP                                                                                                 |                | fv3         |
+RUN     | fv3_gfs_v15p2                                                                                                           |                | fv3         |
+RUN     | fv3_gfs_v16                                                                                                             |                | fv3         |
+RUN     | fv3_gfs_v16_restart                                                                                                     |                |             | fv3_gfs_v16
+RUN     | fv3_gfs_v16_stochy                                                                                                      |                | fv3         |
+RUN     | fv3_gfs_v16_flake                                                                                                       |                | fv3         |
+RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |                | fv3         |
+RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                | fv3         |
 
 COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y                                                          |                | fv3         |
-
-RUN     | fv3_ccpp_gsd                                                                                                            |                | fv3         |
-RUN     | fv3_ccpp_thompson                                                                                                       |                | fv3         |
-RUN     | fv3_ccpp_thompson_no_aero                                                                                               |                | fv3         |
-RUN     | fv3_ccpp_rrfs_v1beta                                                                                                    |                | fv3         |
-
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1                                                           |                | fv3         |
-RUN     | fv3_ccpp_HAFS_v0_hwrf_thompson                                                                                          |                | fv3         |
-#RUN     | fv3_ccpp_HAFS_v0_hwrf                                                                                                   |                | fv3         |
-RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson                                                                                      |                | fv3         |
-RUN     | fv3_ccpp_gfsv16_ugwpv1                                                                                                  |                | fv3         |
-RUN     | fv3_ccpp_gfsv16_ugwpv1_warmstart                                                                                        |                | fv3         |
+RUN     | fv3_gsd                                                                                                                 |                | fv3         |
+RUN     | fv3_thompson                                                                                                            |                | fv3         |
+RUN     | fv3_thompson_no_aero                                                                                                    |                | fv3         |
+RUN     | fv3_rrfs_v1beta                                                                                                         |                | fv3         |
+
+COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                           |                | fv3         |
+RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                | fv3         |
+#RUN     | fv3_HAFS_v0_hwrf                                                                                                        |                | fv3         |
+RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                | fv3         |
+RUN     | fv3_gfsv16_ugwpv1                                                                                                       |                | fv3         |
+RUN     | fv3_gfsv16_ugwpv1_warmstart                                                                                             |                | fv3         |
+RUN     | fv3_gfs_v16_ras                                                                                                         |                | fv3         |
 
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
@@ -35,29 +34,28 @@ RUN     | fv3_ccpp_gfsv16_ugwpv1_warmstart
 
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
 COMPILE | 32BIT=Y DEBUG=Y                                                                                                         |                | fv3         |
-RUN     | fv3_ccpp_control_debug                                                                                                  |                | fv3         |
+RUN     | fv3_control_debug                                                                                                       |                | fv3         |
+RUN     | fv3_regional_control_debug                                                                                              |                | fv3         |
+RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                | fv3         |
+RUN     | fv3_gsd_debug                                                                                                           |                | fv3         |
+RUN     | fv3_thompson_debug                                                                                                      |                | fv3         |
+RUN     | fv3_thompson_no_aero_debug                                                                                              |                | fv3         |
 
 COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP DEBUG=Y                                        |                | fv3         |
-RUN     | fv3_ccpp_gfs_v15p2_debug                                                                                                |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16_debug                                                                                                  |                | fv3         |
-RUN     | fv3_ccpp_gfs_v15p2_RRTMGP_debug                                                                                         |                | fv3         |
-RUN     | fv3_ccpp_gfs_v16_RRTMGP_debug                                                                                           |                | fv3         |
+RUN     | fv3_gfs_v15p2_debug                                                                                                     |                | fv3         |
+RUN     | fv3_gfs_v16_debug                                                                                                       |                | fv3         |
+RUN     | fv3_gfs_v15p2_RRTMGP_debug                                                                                              |                | fv3         |
+RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                | fv3         |
 
 COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                        |                | fv3         |
-RUN     | fv3_ccpp_multigases                                                                                                     |                | fv3         |
-
-COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y                        |                | fv3         |
-RUN     | fv3_ccpp_regional_control_debug                                                                                         |                | fv3         |
-RUN     | fv3_ccpp_rrfs_v1beta_debug                                                                                              |                | fv3         |
-RUN     | fv3_ccpp_gsd_debug                                                                                                      |                | fv3         |
-RUN     | fv3_ccpp_thompson_debug                                                                                                 |                | fv3         |
-RUN     | fv3_ccpp_thompson_no_aero_debug                                                                                         |                | fv3         |
-
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 DEBUG=Y                                                   |                | fv3         |
-RUN     | fv3_ccpp_HAFS_v0_hwrf_thompson_debug                                                                                    |                | fv3         |
-#RUN     | fv3_ccpp_HAFS_v0_hwrf_debug                                                                                             |                | fv3         |
-RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug                                                                                |                | fv3         |
-RUN     | fv3_ccpp_gfsv16_ugwpv1_debug                                                                                            |                | fv3         |
+RUN     | fv3_multigases                                                                                                          |                | fv3         |
+
+COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                                   |                | fv3         |
+RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                | fv3         |
+#RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                  |                | fv3         |
+RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                | fv3         |
+RUN     | fv3_gfsv16_ugwpv1_debug                                                                                                 |                | fv3         |
+RUN     | fv3_gfs_v16_ras_debug                                                                                                   |                | fv3         |
 
 ##################################################################################################################################################################
 # S2S tests                                                                                                                                                      #
diff --git a/tests/tests/fv3_ccpp_2threads b/tests/tests/fv3_2threads
similarity index 97%
rename from tests/tests/fv3_ccpp_2threads
rename to tests/tests/fv3_2threads
index 0d1dee9a71..2f586b8df0 100644
--- a/tests/tests/fv3_ccpp_2threads
+++ b/tests/tests/fv3_2threads
@@ -80,7 +80,7 @@ export INPES=$INPES_thrd
 export JNPES=$JNPES_thrd
 export WRTTASK_PER_GROUP=12
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf b/tests/tests/fv3_HAFS_v0_hwrf
similarity index 97%
rename from tests/tests/fv3_ccpp_HAFS_v0_hwrf
rename to tests/tests/fv3_HAFS_v0_hwrf
index b9e2eae107..c43a6836c4 100644
--- a/tests/tests/fv3_ccpp_HAFS_v0_hwrf
+++ b/tests/tests/fv3_HAFS_v0_hwrf
@@ -77,9 +77,9 @@ export NODES=$(expr $TASKS / $TPN + 1)
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_c96_HAFS_v0_hwrf_run.IN
+export FV3_RUN=c96_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf
-export INPUT_NML=ccpp_c96_HAFS_v0_hwrf.nml.IN
+export INPUT_NML=c96_HAFS_v0_hwrf.nml.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug b/tests/tests/fv3_HAFS_v0_hwrf_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug
rename to tests/tests/fv3_HAFS_v0_hwrf_debug
index 08833a6720..58ec082655 100644
--- a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug
+++ b/tests/tests/fv3_HAFS_v0_hwrf_debug
@@ -80,9 +80,9 @@ export FDIAG=3
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_c96_HAFS_v0_hwrf_run.IN
+export FV3_RUN=c96_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf
-export INPUT_NML=ccpp_c96_HAFS_v0_hwrf.nml.IN
+export INPUT_NML=c96_HAFS_v0_hwrf.nml.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson b/tests/tests/fv3_HAFS_v0_hwrf_thompson
similarity index 97%
rename from tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson
rename to tests/tests/fv3_HAFS_v0_hwrf_thompson
index 3b17849361..3f6313edd2 100644
--- a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson
+++ b/tests/tests/fv3_HAFS_v0_hwrf_thompson
@@ -77,9 +77,9 @@ export NODES=$(expr $TASKS / $TPN + 1)
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_c96_HAFS_v0_hwrf_run.IN
+export FV3_RUN=c96_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf_thompson
-export INPUT_NML=ccpp_c96_HAFS_v0_hwrf.nml.IN
+export INPUT_NML=c96_HAFS_v0_hwrf.nml.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug
rename to tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
index b56589d179..f7a26e2623 100644
--- a/tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug
+++ b/tests/tests/fv3_HAFS_v0_hwrf_thompson_debug
@@ -80,9 +80,9 @@ export FDIAG=3
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_c96_HAFS_v0_hwrf_run.IN
+export FV3_RUN=c96_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf_thompson
-export INPUT_NML=ccpp_c96_HAFS_v0_hwrf.nml.IN
+export INPUT_NML=c96_HAFS_v0_hwrf.nml.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_appbuild b/tests/tests/fv3_appbuild
similarity index 97%
rename from tests/tests/fv3_ccpp_appbuild
rename to tests/tests/fv3_appbuild
index 30ec1a9b0d..8fd32fa0c7 100644
--- a/tests/tests/fv3_ccpp_appbuild
+++ b/tests/tests/fv3_appbuild
@@ -73,7 +73,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_ca b/tests/tests/fv3_ca
similarity index 97%
rename from tests/tests/fv3_ccpp_ca
rename to tests/tests/fv3_ca
index 0ea62c1dfc..1dbf48cb7c 100644
--- a/tests/tests/fv3_ccpp_ca
+++ b/tests/tests/fv3_ca
@@ -73,9 +73,9 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_ca.nml.IN
+export INPUT_NML=ca.nml.IN
 
 export DO_CA=.T.
 export CA_SGS=.T.
diff --git a/tests/tests/fv3_ccpp_control b/tests/tests/fv3_control
similarity index 97%
rename from tests/tests/fv3_ccpp_control
rename to tests/tests/fv3_control
index d9301b68b4..ab4ed8a20e 100644
--- a/tests/tests/fv3_ccpp_control
+++ b/tests/tests/fv3_control
@@ -75,7 +75,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 export RESTART_INTERVAL=12
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_control_32bit b/tests/tests/fv3_control_32bit
similarity index 97%
rename from tests/tests/fv3_ccpp_control_32bit
rename to tests/tests/fv3_control_32bit
index b435bd109d..4b323625a4 100644
--- a/tests/tests/fv3_ccpp_control_32bit
+++ b/tests/tests/fv3_control_32bit
@@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_control_debug b/tests/tests/fv3_control_debug
similarity index 94%
rename from tests/tests/fv3_ccpp_control_debug
rename to tests/tests/fv3_control_debug
index f30a5058b2..46d1bb70a8 100644
--- a/tests/tests/fv3_ccpp_control_debug
+++ b/tests/tests/fv3_control_debug
@@ -37,7 +37,7 @@ export_fv3
 
 export FHMAX="06"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_cpt b/tests/tests/fv3_cpt
similarity index 97%
rename from tests/tests/fv3_ccpp_cpt
rename to tests/tests/fv3_cpt
index a182a6a2d5..4d357afb93 100644
--- a/tests/tests/fv3_ccpp_cpt
+++ b/tests/tests/fv3_cpt
@@ -80,8 +80,8 @@ export NPZ='127'
 export NPZP='128'
 
 
-export INPUT_NML=ccpp_cpt.nml.IN
-export FV3_RUN=ccpp_cpt_run.IN
+export INPUT_NML=cpt.nml.IN
+export FV3_RUN=cpt_run.IN
 export CCPP_SUITE=FV3_CPT_v0
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
diff --git a/tests/tests/fv3_ccpp_csawmg b/tests/tests/fv3_csawmg
similarity index 97%
rename from tests/tests/fv3_ccpp_csawmg
rename to tests/tests/fv3_csawmg
index d49f2a48a1..d60218bc59 100644
--- a/tests/tests/fv3_ccpp_csawmg
+++ b/tests/tests/fv3_csawmg
@@ -56,8 +56,8 @@ export_fv3
 
 DT_ATMOS="600"
 
-export INPUT_NML=ccpp_csawmg.nml.IN
-export FV3_RUN=ccpp_csawmg_run.IN
+export INPUT_NML=csawmg.nml.IN
+export FV3_RUN=csawmg_run.IN
 export CCPP_SUITE=FV3_GFS_2017_csawmg
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
diff --git a/tests/tests/fv3_ccpp_csawmg3shoc127 b/tests/tests/fv3_csawmg3shoc127
similarity index 96%
rename from tests/tests/fv3_ccpp_csawmg3shoc127
rename to tests/tests/fv3_csawmg3shoc127
index 1fb11f4584..a4ea34bb79 100644
--- a/tests/tests/fv3_ccpp_csawmg3shoc127
+++ b/tests/tests/fv3_csawmg3shoc127
@@ -70,8 +70,8 @@ export JNPES='8'
 export NPZ='127'
 export NPZP='128'
 
-export INPUT_NML=ccpp_csawmg3shoc127.nml.IN
-export FV3_RUN=ccpp_csawmg3shoc127_run.IN
+export INPUT_NML=csawmg3shoc127.nml.IN
+export FV3_RUN=csawmg3shoc127_run.IN
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
diff --git a/tests/tests/fv3_ccpp_csawmgshoc b/tests/tests/fv3_csawmgshoc
similarity index 96%
rename from tests/tests/fv3_ccpp_csawmgshoc
rename to tests/tests/fv3_csawmgshoc
index f68bc3504a..65af33608e 100644
--- a/tests/tests/fv3_ccpp_csawmgshoc
+++ b/tests/tests/fv3_csawmgshoc
@@ -56,8 +56,8 @@ export_fv3
 
 DT_ATMOS="600"
 
-export INPUT_NML=ccpp_csawmgshoc.nml.IN
-export FV3_RUN=ccpp_csawmgshoc_run.IN
+export INPUT_NML=csawmgshoc.nml.IN
+export FV3_RUN=csawmgshoc_run.IN
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
diff --git a/tests/tests/fv3_ccpp_decomp b/tests/tests/fv3_decomp
similarity index 97%
rename from tests/tests/fv3_ccpp_decomp
rename to tests/tests/fv3_decomp
index da4e91205a..4482c85111 100644
--- a/tests/tests/fv3_ccpp_decomp
+++ b/tests/tests/fv3_decomp
@@ -77,7 +77,7 @@ export_fv3
 export INPES=6
 export JNPES=4
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson
similarity index 90%
rename from tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson
rename to tests/tests/fv3_esg_HAFS_v0_hwrf_thompson
index 2188cfa3a9..e5bd40ffaa 100644
--- a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson
+++ b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson
@@ -30,10 +30,10 @@ export FDIAG=3
 
 DT_ATMOS="300"
 
-export FV3_RUN=ccpp_esg_HAFS_v0_hwrf_run.IN
+export FV3_RUN=esg_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf_thompson
-export INPUT_NML=ccpp_esg_HAFS_v0_hwrf.nml.IN
-export MODEL_CONFIGURE=ccpp_esg_HAFS_v0_hwrf-model_configure.IN
+export INPUT_NML=esg_HAFS_v0_hwrf.nml.IN
+export MODEL_CONFIGURE=esg_HAFS_v0_hwrf-model_configure.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson_debug
similarity index 90%
rename from tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
rename to tests/tests/fv3_esg_HAFS_v0_hwrf_thompson_debug
index dea85c2bf3..069b81c4c0 100644
--- a/tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
+++ b/tests/tests/fv3_esg_HAFS_v0_hwrf_thompson_debug
@@ -30,10 +30,10 @@ export FDIAG=1
 
 DT_ATMOS="300"
 
-export FV3_RUN=ccpp_esg_HAFS_v0_hwrf_run.IN
+export FV3_RUN=esg_HAFS_v0_hwrf_run.IN
 export CCPP_SUITE=HAFS_v0_hwrf_thompson
-export INPUT_NML=ccpp_esg_HAFS_v0_hwrf.nml.IN
-export MODEL_CONFIGURE=ccpp_esg_HAFS_v0_hwrf-model_configure.IN
+export INPUT_NML=esg_HAFS_v0_hwrf.nml.IN
+export MODEL_CONFIGURE=esg_HAFS_v0_hwrf-model_configure.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_gf b/tests/tests/fv3_gf
similarity index 98%
rename from tests/tests/fv3_ccpp_gf
rename to tests/tests/fv3_gf
index 00a7fcfe30..9fb3c6f2c1 100644
--- a/tests/tests/fv3_ccpp_gf
+++ b/tests/tests/fv3_gf
@@ -78,9 +78,9 @@ export IMP_PHYSICS=11
 export DNATS=1
 export DO_SAT_ADJ=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v15_gf
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.T.
 export DO_MYNNEDMF=.F.
diff --git a/tests/tests/fv3_ccpp_gf_thompson b/tests/tests/fv3_gf_thompson
similarity index 98%
rename from tests/tests/fv3_ccpp_gf_thompson
rename to tests/tests/fv3_gf_thompson
index 78922beb8c..a81644cc44 100644
--- a/tests/tests/fv3_ccpp_gf_thompson
+++ b/tests/tests/fv3_gf_thompson
@@ -80,9 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v15_gf_thompson
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.T.
 export DO_MYNNEDMF=.F.
diff --git a/tests/tests/fv3_ccpp_gfdlmp b/tests/tests/fv3_gfdlmp
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmp
rename to tests/tests/fv3_gfdlmp
index a965807bc1..ca881f8be8 100644
--- a/tests/tests/fv3_ccpp_gfdlmp
+++ b/tests/tests/fv3_gfdlmp
@@ -60,7 +60,7 @@ export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmp_32bit b/tests/tests/fv3_gfdlmp_32bit
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmp_32bit
rename to tests/tests/fv3_gfdlmp_32bit
index 1249268bb1..d35f605ef5 100644
--- a/tests/tests/fv3_ccpp_gfdlmp_32bit
+++ b/tests/tests/fv3_gfdlmp_32bit
@@ -60,7 +60,7 @@ export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmprad b/tests/tests/fv3_gfdlmprad
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmprad
rename to tests/tests/fv3_gfdlmprad
index 5d1b9ccdf2..cef9d92429 100644
--- a/tests/tests/fv3_ccpp_gfdlmprad
+++ b/tests/tests/fv3_gfdlmprad
@@ -76,6 +76,6 @@ export coupling_interval_sec=3600.0  #coupling time step, want it to be multiple
 export NEMS_CONFIGURE="nems.configure.blocked_atm_wav.IN"
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmprad_32bit_post b/tests/tests/fv3_gfdlmprad_32bit_post
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmprad_32bit_post
rename to tests/tests/fv3_gfdlmprad_32bit_post
index 129fab60f7..c64354aadd 100644
--- a/tests/tests/fv3_ccpp_gfdlmprad_32bit_post
+++ b/tests/tests/fv3_gfdlmprad_32bit_post
@@ -71,6 +71,6 @@ export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmprad_atmwav b/tests/tests/fv3_gfdlmprad_atmwav
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmprad_atmwav
rename to tests/tests/fv3_gfdlmprad_atmwav
index 69fcd18edd..c0287da001 100644
--- a/tests/tests/fv3_ccpp_gfdlmprad_atmwav
+++ b/tests/tests/fv3_gfdlmprad_atmwav
@@ -77,6 +77,6 @@ export coupling_interval_sec=1200.0  #coupling time step, want it to be multiple
 export NEMS_CONFIGURE="nems.configure.blocked_atm_wav_2way.IN"
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmprad_gwd b/tests/tests/fv3_gfdlmprad_gwd
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmprad_gwd
rename to tests/tests/fv3_gfdlmprad_gwd
index cba744dbdb..c50a6b3216 100644
--- a/tests/tests/fv3_ccpp_gfdlmprad_gwd
+++ b/tests/tests/fv3_gfdlmprad_gwd
@@ -66,6 +66,6 @@ export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
 
diff --git a/tests/tests/fv3_ccpp_gfdlmprad_noahmp b/tests/tests/fv3_gfdlmprad_noahmp
similarity index 97%
rename from tests/tests/fv3_ccpp_gfdlmprad_noahmp
rename to tests/tests/fv3_gfdlmprad_noahmp
index 3767fd7804..cca8148dcb 100644
--- a/tests/tests/fv3_ccpp_gfdlmprad_noahmp
+++ b/tests/tests/fv3_gfdlmprad_noahmp
@@ -70,6 +70,6 @@ export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp_noahmp
-export INPUT_NML=ccpp_gfdlmp.nml.IN
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export INPUT_NML=gfdlmp.nml.IN
+export FV3_RUN=gfdlmp_run.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_myj b/tests/tests/fv3_gfs_myj
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_myj
rename to tests/tests/fv3_gfs_myj
index df3839f09c..06b96dd1e0 100644
--- a/tests/tests/fv3_ccpp_gfs_myj
+++ b/tests/tests/fv3_gfs_myj
@@ -76,9 +76,9 @@ export_fv3
 
 DT_ATMOS="900"
 
-export FV3_RUN=ccpp_gfs_v15_run.IN
+export FV3_RUN=gfs_v15_run.IN
 export CCPP_SUITE=FV3_GFS_2017_myj
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
 
 export OZ_PHYS_OLD=.F.
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2 b/tests/tests/fv3_gfs_v15p2
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v15p2
rename to tests/tests/fv3_gfs_v15p2
index 3ebd1474dc..de56b17023 100644
--- a/tests/tests/fv3_ccpp_gfs_v15p2
+++ b/tests/tests/fv3_gfs_v15p2
@@ -76,7 +76,7 @@ export_fv3
 
 DT_ATMOS="1200"
 
-export FV3_RUN=ccpp_gfs_v15_run.IN
+export FV3_RUN=gfs_v15_run.IN
 export CCPP_SUITE=FV3_GFS_v15p2
-export INPUT_NML=ccpp_v15p2_c96.nml.IN
+export INPUT_NML=v15p2_c96.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP b/tests/tests/fv3_gfs_v15p2_RRTMGP
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP
rename to tests/tests/fv3_gfs_v15p2_RRTMGP
index ad6bb66faf..ef2880927a 100644
--- a/tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP
+++ b/tests/tests/fv3_gfs_v15p2_RRTMGP
@@ -77,7 +77,7 @@ export_fv3
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 
-export FV3_RUN=ccpp_gfs_v15_run.IN
+export FV3_RUN=gfs_v15_run.IN
 export CCPP_SUITE=FV3_GFS_v15p2_RRTMGP
-export INPUT_NML=ccpp_v15p2_c96_rrtmgp.nml.IN
+export INPUT_NML=v15p2_c96_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP_debug b/tests/tests/fv3_gfs_v15p2_RRTMGP_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP_debug
rename to tests/tests/fv3_gfs_v15p2_RRTMGP_debug
index ba67d28114..81f6eac50e 100644
--- a/tests/tests/fv3_ccpp_gfs_v15p2_RRTMGP_debug
+++ b/tests/tests/fv3_gfs_v15p2_RRTMGP_debug
@@ -77,7 +77,7 @@ export FHMAX="06"
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 
-export FV3_RUN=ccpp_gfs_v15_run.IN
+export FV3_RUN=gfs_v15_run.IN
 export CCPP_SUITE=FV3_GFS_v15p2_RRTMGP
-export INPUT_NML=ccpp_v15p2_c96_rrtmgp.nml.IN
+export INPUT_NML=v15p2_c96_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v15p2_debug b/tests/tests/fv3_gfs_v15p2_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v15p2_debug
rename to tests/tests/fv3_gfs_v15p2_debug
index f5f6b59a2d..37d71a64be 100644
--- a/tests/tests/fv3_ccpp_gfs_v15p2_debug
+++ b/tests/tests/fv3_gfs_v15p2_debug
@@ -76,7 +76,7 @@ export_fv3
 export FHMAX="06"
 DT_ATMOS="1200"
 
-export FV3_RUN=ccpp_gfs_v15_run.IN
+export FV3_RUN=gfs_v15_run.IN
 export CCPP_SUITE=FV3_GFS_v15p2
-export INPUT_NML=ccpp_v15p2_c96.nml.IN
+export INPUT_NML=v15p2_c96.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16 b/tests/tests/fv3_gfs_v16
similarity index 98%
rename from tests/tests/fv3_ccpp_gfs_v16
rename to tests/tests/fv3_gfs_v16
index 89550fc9cc..72c5e5f27d 100644
--- a/tests/tests/fv3_ccpp_gfs_v16
+++ b/tests/tests/fv3_gfs_v16
@@ -93,8 +93,8 @@ export RESTART_INTERVAL=24
 
 export NSTF_NAME=2,1,0,0,0
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=ccpp_v16_c96.nml.IN
+export INPUT_NML=v16_c96.nml.IN
 
 export WLCLK=30
diff --git a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP b/tests/tests/fv3_gfs_v16_RRTMGP
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_RRTMGP
rename to tests/tests/fv3_gfs_v16_RRTMGP
index 574fe3ae0d..306907184d 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP
+++ b/tests/tests/fv3_gfs_v16_RRTMGP
@@ -77,7 +77,7 @@ export_fv3
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP
-export INPUT_NML=ccpp_v16_c96_rrtmgp.nml.IN
+export INPUT_NML=v16_c96_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd b/tests/tests/fv3_gfs_v16_RRTMGP_2thrd
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd
rename to tests/tests/fv3_gfs_v16_RRTMGP_2thrd
index ec4d6d131f..2778beae72 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_2thrd
+++ b/tests/tests/fv3_gfs_v16_RRTMGP_2thrd
@@ -83,7 +83,7 @@ export WRTTASK_PER_GROUP=12
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP
-export INPUT_NML=ccpp_v16_c96_rrtmgp.nml.IN
+export INPUT_NML=v16_c96_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_c192L127 b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_RRTMGP_c192L127
rename to tests/tests/fv3_gfs_v16_RRTMGP_c192L127
index c65e2f5034..b542ede33b 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_c192L127
+++ b/tests/tests/fv3_gfs_v16_RRTMGP_c192L127
@@ -96,7 +96,7 @@ export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
 export FNSMCC="'global_soilmgldas.statsgo.t382.768.384.grb',"
 export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"
 
-export FV3_RUN=ccpp_gfs_v16_run_c192L127.IN
+export FV3_RUN=gfs_v16_run_c192L127.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP
-export INPUT_NML=ccpp_v16_c192L127_rrtmgp.nml.IN
+export INPUT_NML=v16_c192L127_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_debug b/tests/tests/fv3_gfs_v16_RRTMGP_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_RRTMGP_debug
rename to tests/tests/fv3_gfs_v16_RRTMGP_debug
index 169f6415ac..0bf86c202c 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_RRTMGP_debug
+++ b/tests/tests/fv3_gfs_v16_RRTMGP_debug
@@ -77,7 +77,7 @@ export FHMAX="06"
 DT_ATMOS="1200"
 export DO_RRTMGP=.T.
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16_RRTMGP
-export INPUT_NML=ccpp_v16_c96_rrtmgp.nml.IN
+export INPUT_NML=v16_c96_rrtmgp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_debug b/tests/tests/fv3_gfs_v16_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_debug
rename to tests/tests/fv3_gfs_v16_debug
index f27083f806..2091a8f60c 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_debug
+++ b/tests/tests/fv3_gfs_v16_debug
@@ -78,7 +78,7 @@ DT_ATMOS="1200"
 
 export NSTF_NAME=2,1,0,0,0
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=ccpp_v16_c96.nml.IN
+export INPUT_NML=v16_c96.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_flake b/tests/tests/fv3_gfs_v16_flake
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_flake
rename to tests/tests/fv3_gfs_v16_flake
index bd270d5b2c..1b0ffd5432 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_flake
+++ b/tests/tests/fv3_gfs_v16_flake
@@ -76,7 +76,7 @@ export_fv3
 
 DT_ATMOS="1200"
 
-export FV3_RUN=ccpp_gfs_v16_flake_run.IN
+export FV3_RUN=gfs_v16_flake_run.IN
 export CCPP_SUITE=FV3_GFS_v16_flake
-export INPUT_NML=ccpp_v16_flake_c96.nml.IN
+export INPUT_NML=v16_flake_c96.nml.IN
 
diff --git a/tests/tests/fv3_gfs_v16_ras b/tests/tests/fv3_gfs_v16_ras
new file mode 100644
index 0000000000..7a3af317e3
--- /dev/null
+++ b/tests/tests/fv3_gfs_v16_ras
@@ -0,0 +1,87 @@
+###############################################################################
+#
+#  FV3 GFS v16 + RAS test
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 GFS v16 + RAS results with previous trunk version"
+
+export CNTL_DIR=fv3_gfs_v16_ras
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc"
+
+
+export_fv3
+
+export DT_ATMOS="600"
+
+export INPUT_NML=v16_c96.nml.IN
+export CCPP_SUITE=FV3_GFS_v16_ras
+export FV3_RUN=gfs_v16_run.IN
+
+export RAS=.T.
+export IMFDEEPCNV=-1
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
diff --git a/tests/tests/fv3_gfs_v16_ras_debug b/tests/tests/fv3_gfs_v16_ras_debug
new file mode 100644
index 0000000000..e8d792b768
--- /dev/null
+++ b/tests/tests/fv3_gfs_v16_ras_debug
@@ -0,0 +1,89 @@
+###############################################################################
+#
+#  FV3 GFS v16 + RAS test in DEBUG mode
+#
+###############################################################################
+
+export TEST_DESCR="Compare FV3 GFS v16 + RAS DEBUG results with previous trunk version"
+
+export CNTL_DIR=fv3_gfs_v16_ras_debug
+
+export LIST_FILES="atmos_4xdaily.tile1.nc \
+                   atmos_4xdaily.tile2.nc \
+                   atmos_4xdaily.tile3.nc \
+                   atmos_4xdaily.tile4.nc \
+                   atmos_4xdaily.tile5.nc \
+                   atmos_4xdaily.tile6.nc \
+                   phyf000.tile1.nc \
+                   phyf000.tile2.nc \
+                   phyf000.tile3.nc \
+                   phyf000.tile4.nc \
+                   phyf000.tile5.nc \
+                   phyf000.tile6.nc \
+                   phyf006.tile1.nc \
+                   phyf006.tile2.nc \
+                   phyf006.tile3.nc \
+                   phyf006.tile4.nc \
+                   phyf006.tile5.nc \
+                   phyf006.tile6.nc \
+                   dynf000.tile1.nc \
+                   dynf000.tile2.nc \
+                   dynf000.tile3.nc \
+                   dynf000.tile4.nc \
+                   dynf000.tile5.nc \
+                   dynf000.tile6.nc \
+                   dynf006.tile1.nc \
+                   dynf006.tile2.nc \
+                   dynf006.tile3.nc \
+                   dynf006.tile4.nc \
+                   dynf006.tile5.nc \
+                   dynf006.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc"
+
+
+export_fv3
+
+export FHMAX=6
+export FDIAG=3
+export DT_ATMOS="600"
+
+export INPUT_NML=v16_c96.nml.IN
+export CCPP_SUITE=FV3_GFS_v16_ras
+export FV3_RUN=gfs_v16_run.IN
+
+export RAS=.T.
+export IMFDEEPCNV=-1
+export OZ_PHYS_OLD=.F.
+export OZ_PHYS_NEW=.T.
+export H2O_PHYS=.T.
diff --git a/tests/tests/fv3_ccpp_gfs_v16_restart b/tests/tests/fv3_gfs_v16_restart
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_restart
rename to tests/tests/fv3_gfs_v16_restart
index c95489ea5e..41f9bcb6b6 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_restart
+++ b/tests/tests/fv3_gfs_v16_restart
@@ -68,7 +68,7 @@ export MAKE_NH=.F.
 export MOUNTAIN=.T.
 export NSTF_NAME=2,0,0,0,0
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=ccpp_v16_c96.nml.IN
+export INPUT_NML=v16_c96.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfs_v16_stochy b/tests/tests/fv3_gfs_v16_stochy
similarity index 97%
rename from tests/tests/fv3_ccpp_gfs_v16_stochy
rename to tests/tests/fv3_gfs_v16_stochy
index 007c1f02fe..cfab01181d 100644
--- a/tests/tests/fv3_ccpp_gfs_v16_stochy
+++ b/tests/tests/fv3_gfs_v16_stochy
@@ -86,7 +86,7 @@ export SKEB=0.3
 export SHUM=0.003
 export SPPT=0.2
 
-export FV3_RUN=ccpp_gfs_v16_run.IN
+export FV3_RUN=gfs_v16_run.IN
 export CCPP_SUITE=FV3_GFS_v16
-export INPUT_NML=ccpp_v16_c96.nml.IN
+export INPUT_NML=v16_c96.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_gfsv16_csawmg b/tests/tests/fv3_gfsv16_csawmg
similarity index 96%
rename from tests/tests/fv3_ccpp_gfsv16_csawmg
rename to tests/tests/fv3_gfsv16_csawmg
index 58c49ff18e..b07fa158e4 100644
--- a/tests/tests/fv3_ccpp_gfsv16_csawmg
+++ b/tests/tests/fv3_gfsv16_csawmg
@@ -55,8 +55,8 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 DT_ATMOS="600"
-export INPUT_NML=ccpp_gfsv16_csawmg.nml.IN
-export FV3_RUN=ccpp_gfsv16_csawmg_run.IN
+export INPUT_NML=gfsv16_csawmg.nml.IN
+export FV3_RUN=gfsv16_csawmg_run.IN
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
diff --git a/tests/tests/fv3_ccpp_gfsv16_csawmgt b/tests/tests/fv3_gfsv16_csawmgt
similarity index 96%
rename from tests/tests/fv3_ccpp_gfsv16_csawmgt
rename to tests/tests/fv3_gfsv16_csawmgt
index 60c86f3271..684feb5a9c 100644
--- a/tests/tests/fv3_ccpp_gfsv16_csawmgt
+++ b/tests/tests/fv3_gfsv16_csawmgt
@@ -55,8 +55,8 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 
 DT_ATMOS="600"
-export INPUT_NML=ccpp_gfsv16_csawmg.nml.IN
-export FV3_RUN=ccpp_gfsv16_csawmg_run.IN
+export INPUT_NML=gfsv16_csawmg.nml.IN
+export FV3_RUN=gfsv16_csawmg_run.IN
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
diff --git a/tests/tests/fv3_ccpp_gfsv16_ugwpv1 b/tests/tests/fv3_gfsv16_ugwpv1
similarity index 85%
rename from tests/tests/fv3_ccpp_gfsv16_ugwpv1
rename to tests/tests/fv3_gfsv16_ugwpv1
index daec8b1c96..e6006c7f82 100644
--- a/tests/tests/fv3_ccpp_gfsv16_ugwpv1
+++ b/tests/tests/fv3_gfsv16_ugwpv1
@@ -1,12 +1,12 @@
-###############################################################################
+###############################################
 #
-#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag: fv3_ccpp_gfsv16_ugwpv1
+#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag
 #
-###############################################################################
+###############################################
 
-export TEST_DESCR="Compare fv3_ccpp_gfsv16_ugwpv1 with previous trunk version"
+export TEST_DESCR="Compare FV3 CCPP GFS v16beta with ugwpv1 and gsldrag with previous trunk version"
 
-export CNTL_DIR=fv3_ccpp_gfsv16_ugwpv1
+export CNTL_DIR=fv3_gfsv16_ugwpv1
 
 export LIST_FILES="phyf000.tile1.nc \
                    phyf000.tile2.nc \
@@ -75,10 +75,9 @@ export SHOUR=00
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_gfsv16_ugwpv1_run.IN
+export FV3_RUN=gfsv16_ugwpv1_run.IN
 export CCPP_SUITE=FV3_GFS_v16b_ugwpv1
-export CCPP_LIB_DIR=ccpp/lib
-export INPUT_NML=ccpp_v16_c96_ugwpv1.nml.IN
+export INPUT_NML=v16_c96_ugwpv1.nml.IN
 export WLCLK=30
 
 # Cold start, these are defaults
diff --git a/tests/tests/fv3_ccpp_gfsv16_ugwpv1_debug b/tests/tests/fv3_gfsv16_ugwpv1_debug
similarity index 84%
rename from tests/tests/fv3_ccpp_gfsv16_ugwpv1_debug
rename to tests/tests/fv3_gfsv16_ugwpv1_debug
index 718f438483..de1d4a6f49 100644
--- a/tests/tests/fv3_ccpp_gfsv16_ugwpv1_debug
+++ b/tests/tests/fv3_gfsv16_ugwpv1_debug
@@ -1,12 +1,12 @@
-###########################################################################################
+#############################################################
 #
-#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag in DEBUG mode: fv3_ccpp_gfsv16_ugwpv1_debug
+#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag in DEBUG mode
 #
-###########################################################################################
+#############################################################
 
-export TEST_DESCR="Compare fv3_ccpp_gfsv16_ugwpv1 DEBUG with previous trunk version"
+export TEST_DESCR="Compare FV3 CCPP GFS v16beta with ugwpv1 and gsldrag DEBUG with previous trunk version"
 
-export CNTL_DIR=fv3_ccpp_gfsv16_ugwpv1_debug
+export CNTL_DIR=fv3_gfsv16_ugwpv1_debug
 
 export LIST_FILES="phyf000.tile1.nc \
                    phyf000.tile2.nc \
@@ -75,10 +75,9 @@ export SHOUR=00
 DT_ATMOS="600"
 export FHMAX=6
 
-export FV3_RUN=ccpp_gfsv16_ugwpv1_run.IN
+export FV3_RUN=gfsv16_ugwpv1_run.IN
 export CCPP_SUITE=FV3_GFS_v16b_ugwpv1
-export CCPP_LIB_DIR=ccpp/lib
-export INPUT_NML=ccpp_v16_c96_ugwpv1.nml.IN
+export INPUT_NML=v16_c96_ugwpv1.nml.IN
 export WLCLK=30
 
 # Cold start, these are defaults
diff --git a/tests/tests/fv3_ccpp_gfsv16_ugwpv1_warmstart b/tests/tests/fv3_gfsv16_ugwpv1_warmstart
similarity index 84%
rename from tests/tests/fv3_ccpp_gfsv16_ugwpv1_warmstart
rename to tests/tests/fv3_gfsv16_ugwpv1_warmstart
index 049302c5da..74fae7bae7 100644
--- a/tests/tests/fv3_ccpp_gfsv16_ugwpv1_warmstart
+++ b/tests/tests/fv3_gfsv16_ugwpv1_warmstart
@@ -1,12 +1,12 @@
-###############################################################################
+###########################################################
 #
-#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag, warm start: fv3_ccpp_gfsv16_ugwpv1_warmstart
+#  FV3 CCPP GFS v16beta with ugwpv1 and gsldrag, warm start
 #
-###############################################################################
+###########################################################
 
-export TEST_DESCR="Compare fv3_ccpp_gfsv16_ugwpv1 with previous trunk version"
+export TEST_DESCR="Compare FV3 CCPP GFS v16beta with ugwpv1 and gsldrag, warm start with previous trunk version"
 
-export CNTL_DIR=fv3_ccpp_gfsv16_ugwpv1_warmstart
+export CNTL_DIR=fv3_gfsv16_ugwpv1_warmstart
 
 export LIST_FILES="phyf000.tile1.nc \
                    phyf000.tile2.nc \
@@ -75,14 +75,12 @@ export SHOUR=00
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_gfsv16_ugwpv1_run.IN
+export FV3_RUN=gfsv16_ugwpv1_run.IN
 export CCPP_SUITE=FV3_GFS_v16b_ugwpv1
-export CCPP_LIB_DIR=ccpp/lib
-export INPUT_NML=ccpp_v16_c96_ugwpv1.nml.IN
+export INPUT_NML=v16_c96_ugwpv1.nml.IN
 export WLCLK=30
 
 # Warm start
 export WARM_START=.T.
 export EXTERNAL_IC=.F.
 export MOUNTAIN=.T.
-
diff --git a/tests/tests/fv3_ccpp_gocart_clm b/tests/tests/fv3_gocart_clm
similarity index 97%
rename from tests/tests/fv3_ccpp_gocart_clm
rename to tests/tests/fv3_gocart_clm
index 3c27595ec7..c9b7730525 100644
--- a/tests/tests/fv3_ccpp_gocart_clm
+++ b/tests/tests/fv3_gocart_clm
@@ -63,9 +63,9 @@ export IAER=1111
 export HYBEDMF=.true.
 export SATMEDMF=.false.
 
-export FV3_RUN=ccpp_gocart.IN
+export FV3_RUN=gocart.IN
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp
-export INPUT_NML=ccpp.gocart.nml.IN
+export INPUT_NML=gocart.nml.IN
 
 # Increase the number of nodes on Cheyenne to avoid out of memory errors
 if [[ $MACHINE_ID = cheyenne.* ]]; then
diff --git a/tests/tests/fv3_ccpp_gsd b/tests/tests/fv3_gsd
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd
rename to tests/tests/fv3_gsd
index b1e1a7bb5d..7fd6c1ad27 100644
--- a/tests/tests/fv3_ccpp_gsd
+++ b/tests/tests/fv3_gsd
@@ -107,9 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_RRTMGP b/tests/tests/fv3_gsd_RRTMGP
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_RRTMGP
rename to tests/tests/fv3_gsd_RRTMGP
index 2fb8236872..9cf139c0f8 100644
--- a/tests/tests/fv3_ccpp_gsd_RRTMGP
+++ b/tests/tests/fv3_gsd_RRTMGP
@@ -107,9 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_RRTMGP_run.IN
+export FV3_RUN=gsd_RRTMGP_run.IN
 export CCPP_SUITE=FV3_GSD_v0_RRTMGP
-export INPUT_NML=ccpp_gsd_RRTMGP.nml.IN
+export INPUT_NML=gsd_RRTMGP.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_RRTMGP_debug b/tests/tests/fv3_gsd_RRTMGP_debug
similarity index 97%
rename from tests/tests/fv3_ccpp_gsd_RRTMGP_debug
rename to tests/tests/fv3_gsd_RRTMGP_debug
index 00d6519138..63852105db 100644
--- a/tests/tests/fv3_ccpp_gsd_RRTMGP_debug
+++ b/tests/tests/fv3_gsd_RRTMGP_debug
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_RRTMGP_run.IN
+export FV3_RUN=gsd_RRTMGP_run.IN
 export CCPP_SUITE=FV3_GSD_v0_RRTMGP
-export INPUT_NML=ccpp_gsd_RRTMGP.nml.IN
+export INPUT_NML=gsd_RRTMGP.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_coldstart b/tests/tests/fv3_gsd_coldstart
similarity index 96%
rename from tests/tests/fv3_ccpp_gsd_coldstart
rename to tests/tests/fv3_gsd_coldstart
index df3293e5c7..673e8b3170 100644
--- a/tests/tests/fv3_ccpp_gsd_coldstart
+++ b/tests/tests/fv3_gsd_coldstart
@@ -45,9 +45,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_debug b/tests/tests/fv3_gsd_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_debug
rename to tests/tests/fv3_gsd_debug
index ae0c15445b..b937b58f74 100644
--- a/tests/tests/fv3_ccpp_gsd_debug
+++ b/tests/tests/fv3_gsd_debug
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_diag3d_debug b/tests/tests/fv3_gsd_diag3d_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_diag3d_debug
rename to tests/tests/fv3_gsd_diag3d_debug
index c9797035f7..735e295527 100644
--- a/tests/tests/fv3_ccpp_gsd_diag3d_debug
+++ b/tests/tests/fv3_gsd_diag3d_debug
@@ -87,9 +87,9 @@ export LDIAG3D=.T.
 export QDIAG3D=.T.
 export MAX_OUTPUT_FIELDS=400
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite b/tests/tests/fv3_gsd_drag_suite
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_drag_suite
rename to tests/tests/fv3_gsd_drag_suite
index b10aeee7c2..f42b3bad95 100644
--- a/tests/tests/fv3_ccpp_gsd_drag_suite
+++ b/tests/tests/fv3_gsd_drag_suite
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_drag_suite
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp b/tests/tests/fv3_gsd_drag_suite_unified_ugwp
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
rename to tests/tests/fv3_gsd_drag_suite_unified_ugwp
index b598f56bc6..b5d68f21bb 100644
--- a/tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
+++ b/tests/tests/fv3_gsd_drag_suite_unified_ugwp
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_lndp b/tests/tests/fv3_gsd_lndp
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_lndp
rename to tests/tests/fv3_gsd_lndp
index 51f18f714e..39fd4beb85 100644
--- a/tests/tests/fv3_ccpp_gsd_lndp
+++ b/tests/tests/fv3_gsd_lndp
@@ -80,9 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc b/tests/tests/fv3_gsd_mynnsfc
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_mynnsfc
rename to tests/tests/fv3_gsd_mynnsfc
index e9bccdd285..ef557aea22 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc
+++ b/tests/tests/fv3_gsd_mynnsfc
@@ -108,9 +108,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_mynnsfc
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug b/tests/tests/fv3_gsd_mynnsfc_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_mynnsfc_debug
rename to tests/tests/fv3_gsd_mynnsfc_debug
index f1967d6f46..dbd24dd3e1 100644
--- a/tests/tests/fv3_ccpp_gsd_mynnsfc_debug
+++ b/tests/tests/fv3_gsd_mynnsfc_debug
@@ -84,9 +84,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_mynnsfc
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_noah b/tests/tests/fv3_gsd_noah
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_noah
rename to tests/tests/fv3_gsd_noah
index 59ca150b7e..6b76d52140 100644
--- a/tests/tests/fv3_ccpp_gsd_noah
+++ b/tests/tests/fv3_gsd_noah
@@ -107,9 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_noah
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_noah_lndp b/tests/tests/fv3_gsd_noah_lndp
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_noah_lndp
rename to tests/tests/fv3_gsd_noah_lndp
index 41355f5a64..80e4a10a5f 100644
--- a/tests/tests/fv3_ccpp_gsd_noah_lndp
+++ b/tests/tests/fv3_gsd_noah_lndp
@@ -80,9 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_noah
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc b/tests/tests/fv3_gsd_noah_mynnsfc
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_noah_mynnsfc
rename to tests/tests/fv3_gsd_noah_mynnsfc
index 6cfa7b4e1f..bf2c20b624 100644
--- a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc
+++ b/tests/tests/fv3_gsd_noah_mynnsfc
@@ -108,9 +108,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_noah_mynnsfc
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug b/tests/tests/fv3_gsd_noah_mynnsfc_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug
rename to tests/tests/fv3_gsd_noah_mynnsfc_debug
index 6ea180f71c..213b366ce9 100644
--- a/tests/tests/fv3_ccpp_gsd_noah_mynnsfc_debug
+++ b/tests/tests/fv3_gsd_noah_mynnsfc_debug
@@ -84,9 +84,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_noah_mynnsfc
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_sar b/tests/tests/fv3_gsd_sar
similarity index 87%
rename from tests/tests/fv3_ccpp_gsd_sar
rename to tests/tests/fv3_gsd_sar
index a5b06e5e7c..bde8051b90 100644
--- a/tests/tests/fv3_ccpp_gsd_sar
+++ b/tests/tests/fv3_gsd_sar
@@ -26,10 +26,10 @@ export FDIAG=1
 export_fv3
 export TASKS=24
 
-export MODEL_CONFIGURE=ccpp_gsd_sar-model_configure.IN
-export FV3_RUN=ccpp_gsd_sar_run.IN
+export MODEL_CONFIGURE=gsd_sar-model_configure.IN
+export FV3_RUN=gsd_sar_run.IN
 export CCPP_SUITE=FV3_GSD_SAR
-export INPUT_NML=ccpp_gsd_sar.nml.IN
+export INPUT_NML=gsd_sar.nml.IN
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_sar_debug b/tests/tests/fv3_gsd_sar_debug
similarity index 88%
rename from tests/tests/fv3_ccpp_gsd_sar_debug
rename to tests/tests/fv3_gsd_sar_debug
index 673f76627b..57648546ff 100644
--- a/tests/tests/fv3_ccpp_gsd_sar_debug
+++ b/tests/tests/fv3_gsd_sar_debug
@@ -26,10 +26,10 @@ export FDIAG=1
 export_fv3
 export TASKS=24
 
-export MODEL_CONFIGURE=ccpp_gsd_sar-model_configure.IN
-export FV3_RUN=ccpp_gsd_sar_run.IN
+export MODEL_CONFIGURE=gsd_sar-model_configure.IN
+export FV3_RUN=gsd_sar_run.IN
 export CCPP_SUITE=FV3_GSD_SAR
-export INPUT_NML=ccpp_gsd_sar.nml.IN
+export INPUT_NML=gsd_sar.nml.IN
 
 export WLCLK=30
 
diff --git a/tests/tests/fv3_ccpp_gsd_unified_ugwp b/tests/tests/fv3_gsd_unified_ugwp
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_unified_ugwp
rename to tests/tests/fv3_gsd_unified_ugwp
index abc40f8a08..777f246ac5 100644
--- a/tests/tests/fv3_ccpp_gsd_unified_ugwp
+++ b/tests/tests/fv3_gsd_unified_ugwp
@@ -107,9 +107,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_gsd_warmstart b/tests/tests/fv3_gsd_warmstart
similarity index 98%
rename from tests/tests/fv3_ccpp_gsd_warmstart
rename to tests/tests/fv3_gsd_warmstart
index f00337997d..1eda979dbb 100644
--- a/tests/tests/fv3_ccpp_gsd_warmstart
+++ b/tests/tests/fv3_gsd_warmstart
@@ -85,9 +85,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GSD_v0
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_h2ophys b/tests/tests/fv3_h2ophys
similarity index 97%
rename from tests/tests/fv3_ccpp_h2ophys
rename to tests/tests/fv3_h2ophys
index 3ff22e78f6..133cec2efd 100644
--- a/tests/tests/fv3_ccpp_h2ophys
+++ b/tests/tests/fv3_h2ophys
@@ -74,9 +74,9 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017_h2ophys
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
 export H2O_PHYS=.T.
 
diff --git a/tests/tests/fv3_ccpp_hrrr b/tests/tests/fv3_hrrr
similarity index 98%
rename from tests/tests/fv3_ccpp_hrrr
rename to tests/tests/fv3_hrrr
index 27e19500f5..9e9242f8f3 100644
--- a/tests/tests/fv3_ccpp_hrrr
+++ b/tests/tests/fv3_hrrr
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_HRRR
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_iau b/tests/tests/fv3_iau
similarity index 97%
rename from tests/tests/fv3_ccpp_iau
rename to tests/tests/fv3_iau
index bbcc387dc0..4c538e395f 100644
--- a/tests/tests/fv3_ccpp_iau
+++ b/tests/tests/fv3_iau
@@ -86,7 +86,7 @@ export NSTF_NAME=2,0,1,0,5
 export IAU_INC_FILES="fv3_increment.nc"
 export IAU_DRYMASSFIXER=.true.
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_lheatstrg b/tests/tests/fv3_lheatstrg
similarity index 97%
rename from tests/tests/fv3_ccpp_lheatstrg
rename to tests/tests/fv3_lheatstrg
index 6d40d3c63e..5a26497973 100644
--- a/tests/tests/fv3_ccpp_lheatstrg
+++ b/tests/tests/fv3_lheatstrg
@@ -54,9 +54,9 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
 export LHEATSTRG=.T.
 export OUTPUT_GRID="'gaussian_grid'"
diff --git a/tests/tests/fv3_ccpp_lndp b/tests/tests/fv3_lndp
similarity index 97%
rename from tests/tests/fv3_ccpp_lndp
rename to tests/tests/fv3_lndp
index 9ea3dc2847..dc3e0eb0f5 100644
--- a/tests/tests/fv3_ccpp_lndp
+++ b/tests/tests/fv3_lndp
@@ -75,9 +75,9 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 export_fv3
 export NODES=$(expr $TASKS / $TPN + 1)
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_lndp.nml.IN
+export INPUT_NML=lndp.nml.IN
 
 export LNDP_TYPE=2
 export N_VAR_LNDP=2
diff --git a/tests/tests/fv3_ccpp_multigases b/tests/tests/fv3_multigases
similarity index 97%
rename from tests/tests/fv3_ccpp_multigases
rename to tests/tests/fv3_multigases
index 8b2e579305..9ac6f39b59 100644
--- a/tests/tests/fv3_ccpp_multigases
+++ b/tests/tests/fv3_multigases
@@ -89,6 +89,6 @@ SHOUR="06"
 export FHMAX=06
 export FDIAG=0,1,2,3,4,5,6
 export NSTF_NAME=0,0,1,0,5
-export INPUT_NML=ccpp_multi_gases.nml.IN
-export FV3_RUN=ccpp_multigases_run.IN
+export INPUT_NML=multi_gases.nml.IN
+export FV3_RUN=multigases_run.IN
 export CCPP_SUITE=FV3_GFS_2017_fv3wam
diff --git a/tests/tests/fv3_ccpp_mynn b/tests/tests/fv3_mynn
similarity index 98%
rename from tests/tests/fv3_ccpp_mynn
rename to tests/tests/fv3_mynn
index 16a48c1714..a2f805cd88 100644
--- a/tests/tests/fv3_ccpp_mynn
+++ b/tests/tests/fv3_mynn
@@ -78,9 +78,9 @@ export IMP_PHYSICS=11
 export DNATS=1
 export DO_SAT_ADJ=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v15_mynn
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_ntiedtke b/tests/tests/fv3_ntiedtke
similarity index 97%
rename from tests/tests/fv3_ccpp_ntiedtke
rename to tests/tests/fv3_ntiedtke
index 6bae221a55..c437e1e217 100644
--- a/tests/tests/fv3_ccpp_ntiedtke
+++ b/tests/tests/fv3_ntiedtke
@@ -76,9 +76,9 @@ export_fv3
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_ntiedtke
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
 
 export IMFSHALCNV=4
diff --git a/tests/tests/fv3_ccpp_ozphys_2015 b/tests/tests/fv3_ozphys_2015
similarity index 97%
rename from tests/tests/fv3_ccpp_ozphys_2015
rename to tests/tests/fv3_ozphys_2015
index 95fe9918b9..9e7bf03042 100644
--- a/tests/tests/fv3_ccpp_ozphys_2015
+++ b/tests/tests/fv3_ozphys_2015
@@ -74,9 +74,9 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
 
 export_fv3
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017_ozphys_2015
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
diff --git a/tests/tests/fv3_ccpp_rap b/tests/tests/fv3_rap
similarity index 98%
rename from tests/tests/fv3_ccpp_rap
rename to tests/tests/fv3_rap
index 32df243fa0..f8b77c2dff 100644
--- a/tests/tests/fv3_ccpp_rap
+++ b/tests/tests/fv3_rap
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_RAP
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_rasmgshoc b/tests/tests/fv3_rasmgshoc
deleted file mode 100644
index 1bd7c78eec..0000000000
--- a/tests/tests/fv3_rasmgshoc
+++ /dev/null
@@ -1,66 +0,0 @@
-###############################################################################
-#
-#  FV3 RASMGSHOC test
-#
-###############################################################################
-
-export TEST_DESCR="Compare FV3 rasmgshoc results with previous trunk version"
-
-export CNTL_DIR=fv3_rasmgshoc
-
-export LIST_FILES="atmos_4xdaily.tile1.nc \
-                   atmos_4xdaily.tile2.nc \
-                   atmos_4xdaily.tile3.nc \
-                   atmos_4xdaily.tile4.nc \
-                   atmos_4xdaily.tile5.nc \
-                   atmos_4xdaily.tile6.nc \
-                   phyf000.nemsio \
-                   phyf024.nemsio \
-                   dynf000.nemsio \
-                   dynf024.nemsio \
-                   RESTART/coupler.res \
-                   RESTART/fv_core.res.nc \
-                   RESTART/fv_core.res.tile1.nc \
-                   RESTART/fv_core.res.tile2.nc \
-                   RESTART/fv_core.res.tile3.nc \
-                   RESTART/fv_core.res.tile4.nc \
-                   RESTART/fv_core.res.tile5.nc \
-                   RESTART/fv_core.res.tile6.nc \
-                   RESTART/fv_srf_wnd.res.tile1.nc \
-                   RESTART/fv_srf_wnd.res.tile2.nc \
-                   RESTART/fv_srf_wnd.res.tile3.nc \
-                   RESTART/fv_srf_wnd.res.tile4.nc \
-                   RESTART/fv_srf_wnd.res.tile5.nc \
-                   RESTART/fv_srf_wnd.res.tile6.nc \
-                   RESTART/fv_tracer.res.tile1.nc \
-                   RESTART/fv_tracer.res.tile2.nc \
-                   RESTART/fv_tracer.res.tile3.nc \
-                   RESTART/fv_tracer.res.tile4.nc \
-                   RESTART/fv_tracer.res.tile5.nc \
-                   RESTART/fv_tracer.res.tile6.nc \
-                   RESTART/phy_data.tile1.nc \
-                   RESTART/phy_data.tile2.nc \
-                   RESTART/phy_data.tile3.nc \
-                   RESTART/phy_data.tile4.nc \
-                   RESTART/phy_data.tile5.nc \
-                   RESTART/phy_data.tile6.nc \
-                   RESTART/sfc_data.tile1.nc \
-                   RESTART/sfc_data.tile2.nc \
-                   RESTART/sfc_data.tile3.nc \
-                   RESTART/sfc_data.tile4.nc \
-                   RESTART/sfc_data.tile5.nc \
-                   RESTART/sfc_data.tile6.nc"
-
-
-export_fv3
-
-DT_ATMOS="600"
-
-export INPUT_NML=rasmgshoc.nml.IN
-export FV3_RUN=rasmgshoc_run.IN
-export OUTPUT_GRID="'gaussian_grid'"
-export OUTPUT_FILE="'nemsio'"
-export WRITE_NEMSIOFLIP=.true.
-export WRITE_FSYNCFLAG=.true.
-
-
diff --git a/tests/tests/fv3_ccpp_read_inc b/tests/tests/fv3_read_inc
similarity index 97%
rename from tests/tests/fv3_ccpp_read_inc
rename to tests/tests/fv3_read_inc
index d49e8ddb81..3d842fe259 100644
--- a/tests/tests/fv3_ccpp_read_inc
+++ b/tests/tests/fv3_read_inc
@@ -85,7 +85,7 @@ export FDIAG=3
 export READ_INCREMENT=.T.
 export NSTF_NAME=2,0,1,0,5
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_regional_c768 b/tests/tests/fv3_regional_c768
similarity index 86%
rename from tests/tests/fv3_ccpp_regional_c768
rename to tests/tests/fv3_regional_c768
index 6571c76bc6..cd51a1d6a7 100644
--- a/tests/tests/fv3_ccpp_regional_c768
+++ b/tests/tests/fv3_regional_c768
@@ -18,13 +18,13 @@ export_fv3
 export TASKS=480
 export WLCLK=30
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
 export H2O_PHYS=.T.
 
 export CCPP_SUITE=FV3_GFS_2017_gfdlmp_regional_c768
-export INPUT_NML=ccpp_regional_c768.nml.IN
+export INPUT_NML=regional_c768.nml.IN
 export MODEL_CONFIGURE=regional_c768-model_configure.IN
-export FV3_RUN=ccpp_regional_c786_run.IN
+export FV3_RUN=regional_c786_run.IN
diff --git a/tests/tests/fv3_ccpp_regional_control b/tests/tests/fv3_regional_control
similarity index 92%
rename from tests/tests/fv3_ccpp_regional_control
rename to tests/tests/fv3_regional_control
index dd7f2ee05c..2d96d1b7c1 100644
--- a/tests/tests/fv3_ccpp_regional_control
+++ b/tests/tests/fv3_regional_control
@@ -18,7 +18,7 @@ export_fv3
 
 export TASKS=24
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -29,7 +29,7 @@ export QUILTING=.false.
 export MODEL_CONFIGURE=model_configure_regional.IN
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
 export INPES=4
diff --git a/tests/tests/fv3_ccpp_regional_control_debug b/tests/tests/fv3_regional_control_debug
similarity index 92%
rename from tests/tests/fv3_ccpp_regional_control_debug
rename to tests/tests/fv3_regional_control_debug
index f03ca27909..3ec5822542 100644
--- a/tests/tests/fv3_ccpp_regional_control_debug
+++ b/tests/tests/fv3_regional_control_debug
@@ -19,7 +19,7 @@ export_fv3
 export TASKS=40
 export FHMAX="01"
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -29,7 +29,7 @@ export QUILTING=.false.
 export MODEL_CONFIGURE=model_configure_regional.IN
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 
 export FDIAG=1
 export INPES=5
diff --git a/tests/tests/fv3_ccpp_regional_quilt b/tests/tests/fv3_regional_quilt
similarity index 92%
rename from tests/tests/fv3_ccpp_regional_quilt
rename to tests/tests/fv3_regional_quilt
index 6fcc844d62..3c03e1374a 100644
--- a/tests/tests/fv3_ccpp_regional_quilt
+++ b/tests/tests/fv3_regional_quilt
@@ -21,7 +21,7 @@ export_fv3
 
 export TASKS=28
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -31,7 +31,7 @@ export WRITE_DOPOST=.true.
 export POSTAPP='lam'
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 export MODEL_CONFIGURE=model_configure_regional.IN
 
 export FDIAG=3
diff --git a/tests/tests/fv3_ccpp_regional_quilt_hafs b/tests/tests/fv3_regional_quilt_hafs
similarity index 91%
rename from tests/tests/fv3_ccpp_regional_quilt_hafs
rename to tests/tests/fv3_regional_quilt_hafs
index 3cfbbbc2ef..a0b48bea3d 100644
--- a/tests/tests/fv3_ccpp_regional_quilt_hafs
+++ b/tests/tests/fv3_regional_quilt_hafs
@@ -19,7 +19,7 @@ export_fv3
 
 export TASKS=28
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -29,7 +29,7 @@ export WRITE_DOPOST=.true.
 export POSTAPP='hafs'
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 export MODEL_CONFIGURE=model_configure_hafs.IN
 
 export FDIAG=3
diff --git a/tests/tests/fv3_ccpp_regional_quilt_netcdf_parallel b/tests/tests/fv3_regional_quilt_netcdf_parallel
similarity index 92%
rename from tests/tests/fv3_ccpp_regional_quilt_netcdf_parallel
rename to tests/tests/fv3_regional_quilt_netcdf_parallel
index 2a8ee350b0..48860e3029 100644
--- a/tests/tests/fv3_ccpp_regional_quilt_netcdf_parallel
+++ b/tests/tests/fv3_regional_quilt_netcdf_parallel
@@ -18,7 +18,7 @@ export_fv3
 
 export TASKS=28
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -29,7 +29,7 @@ export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
 export INPES=6
diff --git a/tests/tests/fv3_ccpp_regional_restart b/tests/tests/fv3_regional_restart
similarity index 93%
rename from tests/tests/fv3_ccpp_regional_restart
rename to tests/tests/fv3_regional_restart
index cd4c21022d..732baf77a0 100644
--- a/tests/tests/fv3_ccpp_regional_restart
+++ b/tests/tests/fv3_regional_restart
@@ -17,7 +17,7 @@ export_fv3
 export TASKS=24
 export WARM_START=.T.
 
-export FV3_RUN=ccpp_regional_run.IN
+export FV3_RUN=regional_run.IN
 
 export OZ_PHYS_OLD=.F.
 export OZ_PHYS_NEW=.T.
@@ -27,7 +27,7 @@ export QUILTING=.false.
 export MODEL_CONFIGURE=model_configure_regional.IN
 
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_regional.nml.IN
+export INPUT_NML=regional.nml.IN
 
 export FDIAG=3
 export INPES=4
diff --git a/tests/tests/fv3_ccpp_restart b/tests/tests/fv3_restart
similarity index 97%
rename from tests/tests/fv3_ccpp_restart
rename to tests/tests/fv3_restart
index 5a04227a59..da2fb937bc 100644
--- a/tests/tests/fv3_ccpp_restart
+++ b/tests/tests/fv3_restart
@@ -67,7 +67,7 @@ export NA_INIT=0
 export FDIAG=3
 export NSTF_NAME=2,0,1,0,5
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta b/tests/tests/fv3_rrfs_v1beta
similarity index 98%
rename from tests/tests/fv3_ccpp_rrfs_v1beta
rename to tests/tests/fv3_rrfs_v1beta
index d5a9f5f686..615a859242 100644
--- a/tests/tests/fv3_ccpp_rrfs_v1beta
+++ b/tests/tests/fv3_rrfs_v1beta
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_RRFS_v1beta
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_rrfs_v1beta_debug b/tests/tests/fv3_rrfs_v1beta_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_rrfs_v1beta_debug
rename to tests/tests/fv3_rrfs_v1beta_debug
index 66e4b02ed7..465e486259 100644
--- a/tests/tests/fv3_ccpp_rrfs_v1beta_debug
+++ b/tests/tests/fv3_rrfs_v1beta_debug
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_RRFS_v1beta
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_sas b/tests/tests/fv3_sas
similarity index 97%
rename from tests/tests/fv3_ccpp_sas
rename to tests/tests/fv3_sas
index ab1bfd25aa..7d4a5bd847 100644
--- a/tests/tests/fv3_ccpp_sas
+++ b/tests/tests/fv3_sas
@@ -62,7 +62,7 @@ export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_sas
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_satmedmf b/tests/tests/fv3_satmedmf
similarity index 97%
rename from tests/tests/fv3_ccpp_satmedmf
rename to tests/tests/fv3_satmedmf
index 514e1a62c6..525c6da53b 100644
--- a/tests/tests/fv3_ccpp_satmedmf
+++ b/tests/tests/fv3_satmedmf
@@ -62,7 +62,7 @@ export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
-export FV3_RUN=ccpp_satmedmf_run.IN
+export FV3_RUN=satmedmf_run.IN
 export CCPP_SUITE=FV3_GFS_2017_satmedmf
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_satmedmfq b/tests/tests/fv3_satmedmfq
similarity index 97%
rename from tests/tests/fv3_ccpp_satmedmfq
rename to tests/tests/fv3_satmedmfq
index b4c4aa8d7b..c078518d61 100644
--- a/tests/tests/fv3_ccpp_satmedmfq
+++ b/tests/tests/fv3_satmedmfq
@@ -63,7 +63,7 @@ export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
-export FV3_RUN=ccpp_satmedmf_run.IN
+export FV3_RUN=satmedmf_run.IN
 export CCPP_SUITE=FV3_GFS_2017_satmedmfq
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_shinhong b/tests/tests/fv3_shinhong
similarity index 97%
rename from tests/tests/fv3_ccpp_shinhong
rename to tests/tests/fv3_shinhong
index 77c65967a2..a2108bccaa 100644
--- a/tests/tests/fv3_ccpp_shinhong
+++ b/tests/tests/fv3_shinhong
@@ -76,9 +76,9 @@ export_fv3
 
 DT_ATMOS="1200"
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_shinhong
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
 
 export HYBEDMF=.F.
diff --git a/tests/tests/fv3_ccpp_stochy b/tests/tests/fv3_stochy
similarity index 97%
rename from tests/tests/fv3_ccpp_stochy
rename to tests/tests/fv3_stochy
index 6ac9305c72..b9662c8d9e 100644
--- a/tests/tests/fv3_ccpp_stochy
+++ b/tests/tests/fv3_stochy
@@ -83,7 +83,7 @@ export SPPT=0.2
 export DT_ATMOS=600
 export FHMAX=12
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_stretched b/tests/tests/fv3_stretched
similarity index 97%
rename from tests/tests/fv3_ccpp_stretched
rename to tests/tests/fv3_stretched
index 3bcca69498..055eb1c47c 100644
--- a/tests/tests/fv3_ccpp_stretched
+++ b/tests/tests/fv3_stretched
@@ -84,8 +84,8 @@ FHMAX="48"
 DT_ATMOS="450"
 QUILTING=.false.
 
-export INPUT_NML=ccpp_stretched-input.nml.IN
-export FV3_RUN=ccpp_stretched_run.IN
+export INPUT_NML=stretched-input.nml.IN
+export FV3_RUN=stretched_run.IN
 
 export CCPP_SUITE=FV3_GFS_2017_stretched
 
diff --git a/tests/tests/fv3_ccpp_stretched_nest b/tests/tests/fv3_stretched_nest
similarity index 96%
rename from tests/tests/fv3_ccpp_stretched_nest
rename to tests/tests/fv3_stretched_nest
index 378f384794..391aaba85e 100644
--- a/tests/tests/fv3_ccpp_stretched_nest
+++ b/tests/tests/fv3_stretched_nest
@@ -99,9 +99,9 @@ export FHMAX="48"
 export DT_ATMOS="450"
 QUILTING=.false.
 
-export INPUT_NML=ccpp_stretched-nest-input.nml.IN
-export INPUT_NEST02_NML=ccpp_input_nest02.nml.IN
-export FV3_RUN=ccpp_stretched_run.IN
+export INPUT_NML=stretched-nest-input.nml.IN
+export INPUT_NEST02_NML=input_nest02.nml.IN
+export FV3_RUN=stretched_run.IN
 
 export CCPP_SUITE=FV3_GFS_2017_stretched
 
diff --git a/tests/tests/fv3_ccpp_stretched_nest_debug b/tests/tests/fv3_stretched_nest_debug
similarity index 91%
rename from tests/tests/fv3_ccpp_stretched_nest_debug
rename to tests/tests/fv3_stretched_nest_debug
index ff207a968e..d4d713a7e7 100644
--- a/tests/tests/fv3_ccpp_stretched_nest_debug
+++ b/tests/tests/fv3_stretched_nest_debug
@@ -55,8 +55,8 @@ QUILTING=.false.
 
 export WLCLK=30
 
-export INPUT_NML=ccpp_stretched-nest-input.nml.IN
-export INPUT_NEST02_NML=ccpp_input_nest02.nml.IN
-export FV3_RUN=ccpp_stretched_run.IN
+export INPUT_NML=stretched-nest-input.nml.IN
+export INPUT_NEST02_NML=input_nest02.nml.IN
+export FV3_RUN=stretched_run.IN
 
 export CCPP_SUITE=FV3_GFS_2017_stretched
diff --git a/tests/tests/fv3_ccpp_stretched_nest_quilt b/tests/tests/fv3_stretched_nest_quilt
similarity index 96%
rename from tests/tests/fv3_ccpp_stretched_nest_quilt
rename to tests/tests/fv3_stretched_nest_quilt
index 8a9f8f6081..8d88c2eace 100644
--- a/tests/tests/fv3_ccpp_stretched_nest_quilt
+++ b/tests/tests/fv3_stretched_nest_quilt
@@ -96,10 +96,10 @@ export SHOUR="00"
 export FHMAX="48"
 export DT_ATMOS="450"
 
-export INPUT_NML=ccpp_stretched-nest-input.nml.IN
-export INPUT_NEST02_NML=ccpp_input_nest02.nml.IN
+export INPUT_NML=stretched-nest-input.nml.IN
+export INPUT_NEST02_NML=input_nest02.nml.IN
 export MODEL_CONFIGURE=stretched-nest-quilt-model_configure.IN
-export FV3_RUN=ccpp_stretched_run.IN
+export FV3_RUN=stretched_run.IN
 
 export CCPP_SUITE=FV3_GFS_2017_stretched
 
diff --git a/tests/tests/fv3_ccpp_thompson b/tests/tests/fv3_thompson
similarity index 98%
rename from tests/tests/fv3_ccpp_thompson
rename to tests/tests/fv3_thompson
index 67ecbe9321..6903721a2a 100644
--- a/tests/tests/fv3_ccpp_thompson
+++ b/tests/tests/fv3_thompson
@@ -80,9 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v16_thompson
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export SATMEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_debug b/tests/tests/fv3_thompson_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_thompson_debug
rename to tests/tests/fv3_thompson_debug
index d7586cb1ea..b0e0379a1b 100644
--- a/tests/tests/fv3_ccpp_thompson_debug
+++ b/tests/tests/fv3_thompson_debug
@@ -83,9 +83,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v16_thompson
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export SATMEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_mynn b/tests/tests/fv3_thompson_mynn
similarity index 98%
rename from tests/tests/fv3_ccpp_thompson_mynn
rename to tests/tests/fv3_thompson_mynn
index 18f643eed1..f7db812924 100644
--- a/tests/tests/fv3_ccpp_thompson_mynn
+++ b/tests/tests/fv3_thompson_mynn
@@ -80,9 +80,9 @@ export DO_SAT_ADJ=.F.
 export LRADAR=.T.
 export LTAEROSOL=.T.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export DO_MYNNEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_no_aero b/tests/tests/fv3_thompson_no_aero
similarity index 98%
rename from tests/tests/fv3_ccpp_thompson_no_aero
rename to tests/tests/fv3_thompson_no_aero
index 41b6e4696a..8ca9f57247 100644
--- a/tests/tests/fv3_ccpp_thompson_no_aero
+++ b/tests/tests/fv3_thompson_no_aero
@@ -81,9 +81,9 @@ export LRADAR=.T.
 export NSRADAR_RESET=3600.0
 export LTAEROSOL=.F.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v16_thompson
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export SATMEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_thompson_no_aero_debug b/tests/tests/fv3_thompson_no_aero_debug
similarity index 98%
rename from tests/tests/fv3_ccpp_thompson_no_aero_debug
rename to tests/tests/fv3_thompson_no_aero_debug
index c21269307b..1361e37268 100644
--- a/tests/tests/fv3_ccpp_thompson_no_aero_debug
+++ b/tests/tests/fv3_thompson_no_aero_debug
@@ -84,9 +84,9 @@ export LRADAR=.T.
 export NSRADAR_RESET=3600.0
 export LTAEROSOL=.F.
 
-export FV3_RUN=ccpp_gsd_run.IN
+export FV3_RUN=gsd_run.IN
 export CCPP_SUITE=FV3_GFS_v16_thompson
-export INPUT_NML=ccpp_gsd.nml.IN
+export INPUT_NML=gsd.nml.IN
 
 export HYBEDMF=.F.
 export SATMEDMF=.T.
diff --git a/tests/tests/fv3_ccpp_wrtGauss_nemsio b/tests/tests/fv3_wrtGauss_nemsio
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGauss_nemsio
rename to tests/tests/fv3_wrtGauss_nemsio
index e25c6e8342..2b3b3f844b 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_nemsio
+++ b/tests/tests/fv3_wrtGauss_nemsio
@@ -59,7 +59,7 @@ export OUTPUT_FILE="'nemsio'"
 export WRITE_NEMSIOFLIP=.true.
 export WRITE_FSYNCFLAG=.true.
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c192 b/tests/tests/fv3_wrtGauss_nemsio_c192
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGauss_nemsio_c192
rename to tests/tests/fv3_wrtGauss_nemsio_c192
index 91ee4a51da..65f9e14500 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c192
+++ b/tests/tests/fv3_wrtGauss_nemsio_c192
@@ -80,7 +80,7 @@ export FNSOTC="'global_soiltype.statsgo.t382.768.384.rg.grb',"
 export FNSMCC="'global_soilmgldas.t382.768.384.grb',"
 export FNABSC="'global_mxsnoalb.uariz.t382.768.384.rg.grb',"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768 b/tests/tests/fv3_wrtGauss_nemsio_c768
similarity index 98%
rename from tests/tests/fv3_ccpp_wrtGauss_nemsio_c768
rename to tests/tests/fv3_wrtGauss_nemsio_c768
index 756bb1639b..66f0150c8b 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_nemsio_c768
+++ b/tests/tests/fv3_wrtGauss_nemsio_c768
@@ -102,7 +102,7 @@ export wav_petlist_bounds="1260 1469"
 export coupling_interval_sec=1800.0  #coupling time step, want it to be multiple of 1800 and FV3 time step
 export NEMS_CONFIGURE="nems.configure.blocked_atm_wav.IN"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_wrtGauss_netcdf b/tests/tests/fv3_wrtGauss_netcdf
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGauss_netcdf
rename to tests/tests/fv3_wrtGauss_netcdf
index aee1d8c0d6..a912ce6187 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_netcdf
+++ b/tests/tests/fv3_wrtGauss_netcdf
@@ -57,7 +57,7 @@ export_fv3
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'netcdf'"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_wrtGauss_netcdf_esmf b/tests/tests/fv3_wrtGauss_netcdf_esmf
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGauss_netcdf_esmf
rename to tests/tests/fv3_wrtGauss_netcdf_esmf
index fb3f5ef002..f516074433 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_netcdf_esmf
+++ b/tests/tests/fv3_wrtGauss_netcdf_esmf
@@ -57,7 +57,7 @@ export_fv3
 export OUTPUT_GRID="'gaussian_grid'"
 export OUTPUT_FILE="'netcdf_esmf'"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_wrtGauss_netcdf_parallel b/tests/tests/fv3_wrtGauss_netcdf_parallel
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGauss_netcdf_parallel
rename to tests/tests/fv3_wrtGauss_netcdf_parallel
index 4653734353..bd3feef714 100644
--- a/tests/tests/fv3_ccpp_wrtGauss_netcdf_parallel
+++ b/tests/tests/fv3_wrtGauss_netcdf_parallel
@@ -60,6 +60,6 @@ export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 export NBITS=14
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
diff --git a/tests/tests/fv3_ccpp_wrtGlatlon_netcdf b/tests/tests/fv3_wrtGlatlon_netcdf
similarity index 97%
rename from tests/tests/fv3_ccpp_wrtGlatlon_netcdf
rename to tests/tests/fv3_wrtGlatlon_netcdf
index 14e7f1778a..34d4003d86 100644
--- a/tests/tests/fv3_ccpp_wrtGlatlon_netcdf
+++ b/tests/tests/fv3_wrtGlatlon_netcdf
@@ -57,7 +57,7 @@ export_fv3
 export OUTPUT_GRID="'global_latlon'"
 export OUTPUT_FILE="'netcdf'"
 
-export FV3_RUN=ccpp_control_run.IN
+export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_2017
-export INPUT_NML=ccpp_control.nml.IN
+export INPUT_NML=control.nml.IN
 
diff --git a/tests/tests/fv3_ccpp_ysu b/tests/tests/fv3_ysu
similarity index 97%
rename from tests/tests/fv3_ccpp_ysu
rename to tests/tests/fv3_ysu
index 6292f8e5d9..d90ce0bb4c 100644
--- a/tests/tests/fv3_ccpp_ysu
+++ b/tests/tests/fv3_ysu
@@ -76,9 +76,9 @@ export_fv3
 
 DT_ATMOS="600"
 
-export FV3_RUN=ccpp_gfdlmp_run.IN
+export FV3_RUN=gfdlmp_run.IN
 export CCPP_SUITE=FV3_GFS_2017_ysu
-export INPUT_NML=ccpp_gfdlmp.nml.IN
+export INPUT_NML=gfdlmp.nml.IN
 
 
 export HYBEDMF=.F.

From 3e46f5b7050e18884a0bed13691823ad88d443c3 Mon Sep 17 00:00:00 2001
From: Phil Pegion <38869668+pjpegion@users.noreply.github.com>
Date: Sun, 21 Mar 2021 11:11:40 -0600
Subject: [PATCH 02/10] Stoch updates (#372)

Addition of stochastic physics restarts in netCDF format that will be written at the restart interval, and at end of run.
Addition of stochastic cloud perturbation and microphysics perturbations for SPPT.
Clean up of stochastic physics code.

Co-authored-by: mlee03 <Mikyung.Lee@noaa.gov>
Co-authored-by: MinsukJi-NOAA <minsuk.ji@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
---
 CMakeLists.txt                           |   71 +-
 FMS                                      |    2 +-
 FV3                                      |    2 +-
 fms_files.cmake                          |   92 --
 modulefiles/macosx.gnu/fv3               |    6 +-
 modulefiles/macosx.gnu/fv3_debug         |    6 +-
 stochastic_physics                       |    2 +-
 tests/RegressionTests_cheyenne.gnu.log   |  198 ++--
 tests/RegressionTests_cheyenne.intel.log |  648 +++++------
 tests/RegressionTests_gaea.intel.log     |  618 +++++------
 tests/RegressionTests_hera.gnu.log       |  198 ++--
 tests/RegressionTests_hera.intel.log     |  680 ++++++------
 tests/RegressionTests_jet.intel.log      |  599 +++++------
 tests/RegressionTests_orion.intel.log    | 1250 ++++++++++++----------
 tests/ci/ci.test                         |    2 +-
 tests/parm/input.mom6_ccpp.nml.IN        |    3 -
 tests/rt.conf                            |    2 +-
 tests/rt.sh                              |    4 +-
 tests/utest                              |   10 +-
 tests/utest.bld                          |   44 +-
 20 files changed, 2186 insertions(+), 2251 deletions(-)
 delete mode 100644 fms_files.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67ca10847c..203a5add81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,56 +139,27 @@ endif()
 ###############################################################################
 ### FMS
 ###############################################################################
-include(fms_files.cmake)
-add_library(fms ${fms_src_files} ${fms_headers})
-
-list(APPEND _fms_defs_public use_libMPI
-                             use_netCDF
-                             GFS_PHYS
-                             INTERNAL_FILE_NML)
-if(QUAD_PRECISION)
-  list(APPEND _fms_defs_public ENABLE_QUAD_PRECISION)
-endif()
+set(GFS_PHYS ON CACHE BOOL "Enable GFS Physics")
+if(NOT 32BIT)
+   set(64BIT ON CACHE BOOL "Enable 64-bit")
 
-# check gettid
-include(CheckFunctionExists)
-check_function_exists(gettid HAVE_GETTID)
-if(HAVE_GETTID)
-  list(APPEND _fms_defs_public HAVE_GETTID)
 endif()
-
-target_compile_definitions(fms PUBLIC "${_fms_defs_public}")
-
-if(32BIT)
-  list(APPEND _fms_defs_private OVERLOAD_R4
-                                OVERLOAD_R8)
+if(NOT QUAD_PRECISION)
+  set(ENABLE_QUAD_PRECISION OFF CACHE BOOL "Enable Quad-precision")
 endif()
 
-target_compile_definitions(fms PRIVATE "${_fms_defs_private}")
-
-target_include_directories(fms PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FMS/include>
-                                      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FMS/fms>
-                                      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FMS/fms2_io/include>
-                                      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/FMS/mod>
-                                      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FMS/mpp/include>)
-target_include_directories(fms INTERFACE
-                                      $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>
-                                      $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/mod>)
-target_link_libraries(fms PUBLIC MPI::MPI_Fortran
-                                 NetCDF::NetCDF_Fortran)
-if(OpenMP_Fortran_FOUND)
-  target_link_libraries(fms PRIVATE OpenMP::OpenMP_Fortran)
+add_subdirectory(FMS)
+
+if(32BIT) 
+   add_library(fms ALIAS fms_r4)
+else()
+   add_library(fms ALIAS fms_r8)
 endif()
-set_target_properties(fms PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FMS)
-set_target_properties(fms PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FMS/mod)
-set_target_properties(fms PROPERTIES PUBLIC_HEADER "${fms_headers}" )
 
 ###############################################################################
 ### stochastic_physics
 ###############################################################################
-if(NOT DATM)
   add_subdirectory(stochastic_physics)
-endif()
 
 ###############################################################################
 ### FV3 or Data Atmosphere
@@ -291,7 +262,7 @@ endif()
 target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                          $<INSTALL_INTERFACE:mod>)
 
-target_link_libraries(ufs PUBLIC esmf)
+target_link_libraries(ufs PUBLIC esmf stochastic_physics)
 
 if(DATM)
   target_link_libraries(ufs PUBLIC datatm)
@@ -304,7 +275,7 @@ if(S2S)
                                 FRONT_CICE6=ice_comp_nuopc
                                 CMEPS
                                 FRONT_CMEPS=MED)
-  add_dependencies(ufs mom6 cice cmeps)
+  add_dependencies(ufs mom6 cice cmeps stochastic_physics)
   target_link_libraries(ufs PUBLIC mom6
                                    cice
                                    cmeps)
@@ -336,26 +307,14 @@ if(DATM)
 endif()
 target_link_libraries(ufs_model PRIVATE ufs
                                         esmf
-                                        NetCDF::NetCDF_Fortran
-                                        ${MKL_LIB})
+                                        NetCDF::NetCDF_Fortran)
 
 ###############################################################################
 ### Install
 ###############################################################################
-install(
-  TARGETS fms
-  EXPORT fms-config
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-  PUBLIC_HEADER DESTINATION include )
-
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FMS/mod DESTINATION ${CMAKE_INSTALL_PREFIX})
-
-install(EXPORT fms-config
-  DESTINATION lib/cmake
-)
 install(
   TARGETS ufs
+
   EXPORT ufs-config
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib)
diff --git a/FMS b/FMS
index 0707f2c027..d4724fa36e 160000
--- a/FMS
+++ b/FMS
@@ -1 +1 @@
-Subproject commit 0707f2c0279a9efd12cdbf0133c1e09435766928
+Subproject commit d4724fa36ead10bfd818b7e3092a4824eff7f323
diff --git a/FV3 b/FV3
index dbaff1cbfb..07b00a9a84 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit dbaff1cbfb2764f2ffa605d20d3c1a99c44b01fe
+Subproject commit 07b00a9a84782aa95a18cc8a9c91ba31a76ea619
diff --git a/fms_files.cmake b/fms_files.cmake
deleted file mode 100644
index 81e3cfb381..0000000000
--- a/fms_files.cmake
+++ /dev/null
@@ -1,92 +0,0 @@
-list(APPEND fms_src_files
-    FMS/affinity/fms_affinity.F90
-    FMS/amip_interp/amip_interp.F90
-    FMS/astronomy/astronomy.F90
-    FMS/axis_utils/axis_utils.F90
-    FMS/axis_utils/axis_utils2.F90
-    FMS/block_control/block_control.F90
-    FMS/column_diagnostics/column_diagnostics.F90
-    FMS/constants/constants.F90
-    FMS/coupler/atmos_ocean_fluxes.F90
-    FMS/coupler/coupler_types.F90
-    FMS/coupler/ensemble_manager.F90
-    FMS/data_override/data_override.F90
-    FMS/data_override/get_grid_version_fms2io.F90
-    FMS/data_override/get_grid_version_mpp.F90
-    FMS/diag_integral/diag_integral.F90
-    FMS/diag_manager/diag_axis.F90
-    FMS/diag_manager/diag_data.F90
-    FMS/diag_manager/diag_grid.F90
-    FMS/diag_manager/diag_manager.F90
-    FMS/diag_manager/diag_output.F90
-    FMS/diag_manager/diag_table.F90
-    FMS/diag_manager/diag_util.F90
-    FMS/drifters/cloud_interpolator.F90
-    FMS/drifters/drifters.F90
-    FMS/drifters/drifters_comm.F90
-    FMS/drifters/drifters_core.F90
-    FMS/drifters/drifters_input.F90
-    FMS/drifters/drifters_io.F90
-    FMS/drifters/quicksort.F90
-    FMS/exchange/stock_constants.F90
-    FMS/exchange/xgrid.F90
-    FMS/field_manager/field_manager.F90
-    FMS/field_manager/fm_util.F90
-    FMS/fms/fms.F90
-    FMS/fms/fms_io.F90
-    FMS/fms2_io/blackboxio.F90
-    FMS/fms2_io/fms_io_utils.F90
-    FMS/fms2_io/fms_netcdf_domain_io.F90
-    FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90
-    FMS/fms2_io/fms2_io.F90
-    FMS/fms2_io/netcdf_io.F90
-    FMS/horiz_interp/horiz_interp.F90
-    FMS/horiz_interp/horiz_interp_bicubic.F90
-    FMS/horiz_interp/horiz_interp_bilinear.F90
-    FMS/horiz_interp/horiz_interp_conserve.F90
-    FMS/horiz_interp/horiz_interp_spherical.F90
-    FMS/horiz_interp/horiz_interp_type.F90
-    FMS/interpolator/interpolator.F90
-    FMS/memutils/memutils.F90
-    FMS/monin_obukhov/monin_obukhov.F90
-    FMS/monin_obukhov/monin_obukhov_inter.F90
-    FMS/mosaic/gradient.F90
-    FMS/mosaic/grid.F90
-    FMS/mosaic/mosaic.F90
-    FMS/mosaic/mosaic2.F90
-    FMS/mpp/mpp.F90
-    FMS/mpp/mpp_data.F90
-    FMS/mpp/mpp_domains.F90
-    FMS/mpp/mpp_efp.F90
-    FMS/mpp/mpp_io.F90
-    FMS/mpp/mpp_memutils.F90
-    FMS/mpp/mpp_parameter.F90
-    FMS/mpp/mpp_utilities.F90
-    FMS/platform/platform.F90
-    FMS/random_numbers/mersennetwister.F90
-    FMS/random_numbers/random_numbers.F90
-    FMS/sat_vapor_pres/sat_vapor_pres.F90
-    FMS/sat_vapor_pres/sat_vapor_pres_k.F90
-    FMS/time_interp/time_interp.F90
-    FMS/time_interp/time_interp_external.F90
-    FMS/time_interp/time_interp_external2.F90
-    FMS/time_manager/get_cal_time.F90
-    FMS/time_manager/time_manager.F90
-    FMS/topography/gaussian_topog.F90
-    FMS/topography/topography.F90
-    FMS/tracer_manager/tracer_manager.F90
-    FMS/tridiagonal/tridiagonal.F90
-
-    FMS/affinity/affinity.c
-    FMS/mpp/mpp_memuse.c
-    FMS/mosaic/create_xgrid.c
-    FMS/mosaic/gradient_c2l.c
-    FMS/mosaic/interp.c
-    FMS/mosaic/mosaic_util.c
-    FMS/mosaic/read_mosaic.c
-)
-
-list( APPEND fms_headers 
-FMS/include/fms_platform.h
-FMS/include/file_version.h
-)
diff --git a/modulefiles/macosx.gnu/fv3 b/modulefiles/macosx.gnu/fv3
index f99e07ad70..006e695d66 100755
--- a/modulefiles/macosx.gnu/fv3
+++ b/modulefiles/macosx.gnu/fv3
@@ -39,6 +39,6 @@ fi
 ##
 ## Intel MKL library
 ##
-export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-export MKL_INC="-m64 -I${MKL_DIR}/include"
-export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
+#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
+#export MKL_INC="-m64 -I${MKL_DIR}/include"
+#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/modulefiles/macosx.gnu/fv3_debug b/modulefiles/macosx.gnu/fv3_debug
index f99e07ad70..006e695d66 100755
--- a/modulefiles/macosx.gnu/fv3_debug
+++ b/modulefiles/macosx.gnu/fv3_debug
@@ -39,6 +39,6 @@ fi
 ##
 ## Intel MKL library
 ##
-export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
-export MKL_INC="-m64 -I${MKL_DIR}/include"
-export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
+#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
+#export MKL_INC="-m64 -I${MKL_DIR}/include"
+#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
diff --git a/stochastic_physics b/stochastic_physics
index c39bb8a09a..d0e62eb299 160000
--- a/stochastic_physics
+++ b/stochastic_physics
@@ -1 +1 @@
-Subproject commit c39bb8a09a196a9dd17ea3fb52152b61ef2881ae
+Subproject commit d0e62eb2996b363862fd543fe9ec910bd75bf004
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
index fb18913ac9..3bf1877863 100644
--- a/tests/RegressionTests_cheyenne.gnu.log
+++ b/tests/RegressionTests_cheyenne.gnu.log
@@ -1,9 +1,9 @@
-Wed Mar 17 15:01:40 MDT 2021
+Thu Mar 18 13:19:36 MDT 2021
 Start Regression test
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfdlmp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfdlmp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfdlmp
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfdlmp
 Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -48,13 +48,13 @@ Checking test 001 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 73.616751
+The total amount of wall time                        = 72.427329
 
 Test 001 fv3_gfdlmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2
 Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -119,13 +119,13 @@ Checking test 002 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 137.489110
+The total amount of wall time                        = 136.941182
 
 Test 002 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16
 Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -202,13 +202,13 @@ Checking test 003 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 188.023624
+The total amount of wall time                        = 185.465164
 
 Test 003 fv3_gfs_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_restart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_restart
 Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -255,13 +255,13 @@ Checking test 004 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.352609
+The total amount of wall time                        = 95.241565
 
 Test 004 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_stochy
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_stochy
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_stochy
 Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -326,13 +326,13 @@ Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 87.995187
+The total amount of wall time                        = 89.065852
 
 Test 005 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_flake
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_flake
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_flake
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_flake
 Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -397,13 +397,13 @@ Checking test 006 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 143.045845
+The total amount of wall time                        = 144.758066
 
 Test 006 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_RRTMGP
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_RRTMGP
 Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -468,13 +468,13 @@ Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 251.776369
+The total amount of wall time                        = 233.688023
 
 Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_RRTMGP
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_RRTMGP
 Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -539,13 +539,13 @@ Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 256.904365
+The total amount of wall time                        = 262.519106
 
 Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gsd
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gsd
 Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -634,13 +634,13 @@ Checking test 009 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 352.093742
+The total amount of wall time                        = 352.206210
 
 Test 009 fv3_gsd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson
 Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -705,13 +705,13 @@ Checking test 010 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 166.850767
+The total amount of wall time                        = 166.159439
 
 Test 010 fv3_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_no_aero
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_no_aero
 Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -776,13 +776,13 @@ Checking test 011 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 157.963503
+The total amount of wall time                        = 159.091610
 
 Test 011 fv3_thompson_no_aero PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_rrfs_v1beta
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_rrfs_v1beta
 Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -847,13 +847,13 @@ Checking test 012 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 181.093884
+The total amount of wall time                        = 181.064238
 
 Test 012 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_HAFS_v0_hwrf_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_HAFS_v0_hwrf_thompson
 Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -918,13 +918,13 @@ Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 258.319014
+The total amount of wall time                        = 243.144962
 
 Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_esg_HAFS_v0_hwrf_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -939,13 +939,13 @@ Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 446.279773
+The total amount of wall time                        = 460.237050
 
 Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1
 Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1004,13 +1004,13 @@ Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 299.376887
+The total amount of wall time                        = 298.148424
 
 Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1_warmstart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1_warmstart
 Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1069,13 +1069,13 @@ Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 303.457903
+The total amount of wall time                        = 303.021790
 
 Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_ras
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_ras
 Checking test 017 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1140,13 +1140,13 @@ Checking test 017 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 167.499220
+The total amount of wall time                        = 167.885537
 
 Test 017 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_control_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_control_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_control_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_control_debug
 Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1173,13 +1173,13 @@ Checking test 018 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 76.607637
+The total amount of wall time                        = 77.618175
 
 Test 018 fv3_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_regional_control_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_regional_control_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_regional_control_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_regional_control_debug
 Checking test 019 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1187,13 +1187,13 @@ Checking test 019 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 188.760185
+The total amount of wall time                        = 186.595065
 
 Test 019 fv3_regional_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_rrfs_v1beta_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_rrfs_v1beta_debug
 Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1258,13 +1258,13 @@ Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 110.901097
+The total amount of wall time                        = 109.971979
 
 Test 020 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gsd_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gsd_debug
 Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1329,13 +1329,13 @@ Checking test 021 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.633345
+The total amount of wall time                        = 116.480241
 
 Test 021 fv3_gsd_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_debug
 Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1400,13 +1400,13 @@ Checking test 022 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.570727
+The total amount of wall time                        = 186.048865
 
 Test 022 fv3_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_thompson_no_aero_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_no_aero_debug
 Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1471,13 +1471,13 @@ Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 179.866162
+The total amount of wall time                        = 177.982636
 
 Test 023 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_debug
 Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1542,13 +1542,13 @@ Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 134.004125
+The total amount of wall time                        = 137.547670
 
 Test 024 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_debug
 Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1613,13 +1613,13 @@ Checking test 025 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 97.658277
+The total amount of wall time                        = 96.621232
 
 Test 025 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v15p2_RRTMGP_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1684,13 @@ Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.654978
+The total amount of wall time                        = 198.750607
 
 Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_RRTMGP_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_RRTMGP_debug
 Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1755,13 +1755,13 @@ Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.520481
+The total amount of wall time                        = 205.621718
 
 Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_multigases
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_multigases
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_multigases
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_multigases
 Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1832,13 +1832,13 @@ Checking test 028 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 176.551824
+The total amount of wall time                        = 174.473162
 
 Test 028 fv3_multigases PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_HAFS_v0_hwrf_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1903,13 +1903,13 @@ Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 113.111862
+The total amount of wall time                        = 112.451863
 
 Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_esg_HAFS_v0_hwrf_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1924,13 +1924,13 @@ Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 215.358006
+The total amount of wall time                        = 216.026078
 
 Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfsv16_ugwpv1_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1_debug
 Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1989,13 +1989,13 @@ Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 308.982518
+The total amount of wall time                        = 305.011925
 
 Test 031 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_1787/fv3_gfs_v16_ras_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_ras_debug
 Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2060,11 +2060,11 @@ Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 172.077223
+The total amount of wall time                        = 172.520721
 
 Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 15:22:05 MDT 2021
-Elapsed time: 00h:20m:25s. Have a nice day!
+Thu Mar 18 13:37:55 MDT 2021
+Elapsed time: 00h:18m:19s. Have a nice day!
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
index 889cd4d3ee..f4158365a7 100644
--- a/tests/RegressionTests_cheyenne.intel.log
+++ b/tests/RegressionTests_cheyenne.intel.log
@@ -1,9 +1,9 @@
-Wed Mar 17 15:00:15 MDT 2021
+Thu Mar 18 13:19:41 MDT 2021
 Start Regression test
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +68,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.977801
+The total amount of wall time                        = 47.958572
 
 Test 001 fv3_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_decomp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +139,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.404157
+The total amount of wall time                        = 48.067631
 
 Test 002 fv3_decomp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_2threads
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +210,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.164876
+The total amount of wall time                        = 106.388280
 
 Test 003 fv3_2threads PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_restart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +263,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 22.442370
+The total amount of wall time                        = 22.917253
 
 Test 004 fv3_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_read_inc
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +334,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.585103
+The total amount of wall time                        = 47.473873
 
 Test 005 fv3_read_inc PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf_esmf
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +385,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.916570
+The total amount of wall time                        = 122.527143
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +436,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.465214
+The total amount of wall time                        = 46.852420
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_netcdf_parallel
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -451,9 +451,9 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile5.nc .........OK
  Comparing atmos_4xdaily.tile6.nc .........OK
  Comparing phyf000.nc .........OK
- Comparing phyf024.nc ............ALT CHECK......OK
- Comparing dynf000.nc .........OK
- Comparing dynf024.nc .........OK
+ Comparing phyf024.nc .........OK
+ Comparing dynf000.nc ............ALT CHECK......OK
+ Comparing dynf024.nc ............ALT CHECK......OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -487,13 +487,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.184444
+The total amount of wall time                        = 47.080210
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGlatlon_netcdf
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +538,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.662453
+The total amount of wall time                        = 47.236247
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_nemsio
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +589,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.507193
+The total amount of wall time                        = 47.047256
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_wrtGauss_nemsio_c192
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +640,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 122.393899
+The total amount of wall time                        = 123.070683
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stochy
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +711,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 55.603605
+The total amount of wall time                        = 54.625384
 
 Test 012 fv3_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_ca
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +782,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 29.020025
+The total amount of wall time                        = 29.444011
 
 Test 013 fv3_ca PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_lndp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +853,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 50.850419
+The total amount of wall time                        = 52.987457
 
 Test 014 fv3_lndp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_iau
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +924,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.657869
+The total amount of wall time                        = 45.283016
 
 Test 015 fv3_iau PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_lheatstrg
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +975,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.329600
+The total amount of wall time                        = 46.276234
 
 Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_multigases_repro
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_multigases_repro
 Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1052,13 @@ Checking test 017 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.322209
+The total amount of wall time                        = 111.440695
 
 Test 017 fv3_multigases PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control_32bit
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control_32bit
 Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1123,13 +1123,13 @@ Checking test 018 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 40.080135
+The total amount of wall time                        = 40.434938
 
 Test 018 fv3_control_32bit PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched
 Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1182,13 +1182,13 @@ Checking test 019 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 330.931597
+The total amount of wall time                        = 324.010684
 
 Test 019 fv3_stretched PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched_nest
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched_nest
 Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1252,13 +1252,13 @@ Checking test 020 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 343.913204
+The total amount of wall time                        = 352.560075
 
 Test 020 fv3_stretched_nest PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_control
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_control
 Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1266,25 +1266,25 @@ Checking test 021 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 716.261602
+The total amount of wall time                        = 714.905067
 
 Test 021 fv3_regional_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_restart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_restart
 Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 391.516587
+The total amount of wall time                        = 382.830994
 
 Test 022 fv3_regional_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt
 Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1295,13 +1295,13 @@ Checking test 023 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 740.845723
+The total amount of wall time                        = 721.119525
 
 Test 023 fv3_regional_quilt PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt_hafs
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt_hafs
 Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1310,27 +1310,27 @@ Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 737.470533
+The total amount of wall time                        = 717.041861
 
 Test 024 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_quilt_netcdf_parallel
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt_netcdf_parallel
 Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
- Comparing dynf000.nc .........OK
- Comparing dynf024.nc .........OK
- Comparing phyf000.nc .........OK
+ Comparing dynf000.nc ............ALT CHECK......OK
+ Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing phyf000.nc ............ALT CHECK......OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 741.687853
+The total amount of wall time                        = 717.890376
 
 Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmp
 Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1375,13 +1375,13 @@ Checking test 026 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.724523
+The total amount of wall time                        = 52.663537
 
 Test 026 fv3_gfdlmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_gwd
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_gwd
 Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1426,13 +1426,13 @@ Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.482174
+The total amount of wall time                        = 52.955815
 
 Test 027 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_noahmp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_noahmp
 Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1477,13 +1477,13 @@ Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.864785
+The total amount of wall time                        = 53.663012
 
 Test 028 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_csawmg
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_csawmg
 Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1528,13 +1528,13 @@ Checking test 029 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 137.691614
+The total amount of wall time                        = 140.600685
 
 Test 029 fv3_csawmg PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_satmedmf
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_satmedmf
 Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1579,13 +1579,13 @@ Checking test 030 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.102946
+The total amount of wall time                        = 59.721545
 
 Test 030 fv3_satmedmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_satmedmfq
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_satmedmfq
 Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1630,13 +1630,13 @@ Checking test 031 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.919454
+The total amount of wall time                        = 59.607443
 
 Test 031 fv3_satmedmfq PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmp_32bit
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmp_32bit
 Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1681,13 +1681,13 @@ Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 41.538693
+The total amount of wall time                        = 42.216585
 
 Test 032 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfdlmprad_32bit_post
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_32bit_post
 Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1736,13 +1736,13 @@ Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 72.990521
+The total amount of wall time                        = 73.153192
 
 Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_cpt
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_cpt
 Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1793,13 +1793,13 @@ Checking test 034 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 324.277909
+The total amount of wall time                        = 328.693268
 
 Test 034 fv3_cpt PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd
 Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1888,13 @@ Checking test 035 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 200.510933
+The total amount of wall time                        = 198.976083
 
 Test 035 fv3_gsd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rap
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rap
 Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1959,13 @@ Checking test 036 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.523415
+The total amount of wall time                        = 101.175017
 
 Test 036 fv3_rap PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_hrrr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_hrrr
 Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2030,13 @@ Checking test 037 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.593038
+The total amount of wall time                        = 106.708498
 
 Test 037 fv3_hrrr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson
 Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2101,13 +2101,13 @@ Checking test 038 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.257675
+The total amount of wall time                        = 94.770375
 
 Test 038 fv3_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_no_aero
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_no_aero
 Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2172,13 +2172,13 @@ Checking test 039 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 91.158832
+The total amount of wall time                        = 91.204857
 
 Test 039 fv3_thompson_no_aero PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rrfs_v1beta
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rrfs_v1beta
 Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2243,13 +2243,13 @@ Checking test 040 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 108.271884
+The total amount of wall time                        = 107.160438
 
 Test 040 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16
 Checking test 041 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2326,13 +2326,13 @@ Checking test 041 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.052721
+The total amount of wall time                        = 129.958834
 
 Test 041 fv3_gfs_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_restart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_restart
 Checking test 042 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2379,13 +2379,13 @@ Checking test 042 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.465290
+The total amount of wall time                        = 67.685012
 
 Test 042 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_stochy
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_stochy
 Checking test 043 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2450,13 +2450,13 @@ Checking test 043 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 62.916099
+The total amount of wall time                        = 61.220929
 
 Test 043 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP
 Checking test 044 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2521,13 +2521,13 @@ Checking test 044 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 220.380142
+The total amount of wall time                        = 225.546934
 
 Test 044 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_c192L127
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 045 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2586,13 +2586,13 @@ Checking test 045 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 834.952485
+The total amount of wall time                        = 831.881649
 
 Test 045 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_2thrd
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 046 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2657,13 +2657,13 @@ Checking test 046 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 466.870817
+The total amount of wall time                        = 464.680179
 
 Test 046 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gocart_clm
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gocart_clm
 Checking test 047 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2708,13 +2708,13 @@ Checking test 047 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.031058
+The total amount of wall time                        = 58.082096
 
 Test 047 fv3_gocart_clm PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_flake
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_flake
 Checking test 048 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2779,13 +2779,13 @@ Checking test 048 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.579599
+The total amount of wall time                        = 117.009840
 
 Test 048 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_HAFS_v0_hwrf_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_HAFS_v0_hwrf_thompson
 Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2850,13 +2850,13 @@ Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.376108
+The total amount of wall time                        = 181.728184
 
 Test 049 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_esg_HAFS_v0_hwrf_thompson
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -2871,13 +2871,13 @@ Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 323.367695
+The total amount of wall time                        = 318.936857
 
 Test 050 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1
 Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2936,13 +2936,13 @@ Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 215.379700
+The total amount of wall time                        = 216.580824
 
 Test 051 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1_warmstart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1_warmstart
 Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3001,13 +3001,13 @@ Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 218.012111
+The total amount of wall time                        = 215.713858
 
 Test 052 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_ras
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_ras
 Checking test 053 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3072,13 +3072,13 @@ Checking test 053 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 115.689935
+The total amount of wall time                        = 115.663476
 
 Test 053 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v15p2_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v15p2_debug
 Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3143,13 +3143,13 @@ Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 245.407283
+The total amount of wall time                        = 244.322214
 
 Test 054 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_debug
 Checking test 055 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3214,13 +3214,13 @@ Checking test 055 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 190.404620
+The total amount of wall time                        = 190.266804
 
 Test 055 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v15p2_RRTMGP_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3285,13 +3285,13 @@ Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 384.474234
+The total amount of wall time                        = 386.139272
 
 Test 056 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_RRTMGP_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_debug
 Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3356,13 +3356,13 @@ Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 393.114772
+The total amount of wall time                        = 391.135094
 
 Test 057 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_regional_control_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_control_debug
 Checking test 058 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3370,13 +3370,13 @@ Checking test 058 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 366.899380
+The total amount of wall time                        = 367.762370
 
 Test 058 fv3_regional_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_control_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control_debug
 Checking test 059 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3403,13 +3403,13 @@ Checking test 059 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 146.618466
+The total amount of wall time                        = 147.442953
 
 Test 059 fv3_control_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_stretched_nest_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched_nest_debug
 Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3426,13 +3426,13 @@ Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 432.998634
+The total amount of wall time                        = 433.260613
 
 Test 060 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd_debug
 Checking test 061 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3497,13 +3497,13 @@ Checking test 061 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 216.755184
+The total amount of wall time                        = 216.558308
 
 Test 061 fv3_gsd_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gsd_diag3d_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd_diag3d_debug
 Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3568,13 +3568,13 @@ Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 261.555642
+The total amount of wall time                        = 262.674351
 
 Test 062 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_debug
 Checking test 063 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3639,13 +3639,13 @@ Checking test 063 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 360.248777
+The total amount of wall time                        = 359.965520
 
 Test 063 fv3_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_thompson_no_aero_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_no_aero_debug
 Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3710,13 +3710,13 @@ Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 348.057383
+The total amount of wall time                        = 347.570263
 
 Test 064 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_rrfs_v1beta_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rrfs_v1beta_debug
 Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3781,13 +3781,13 @@ Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 209.467344
+The total amount of wall time                        = 209.696788
 
 Test 065 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_HAFS_v0_hwrf_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3852,13 +3852,13 @@ Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 223.594519
+The total amount of wall time                        = 222.971545
 
 Test 066 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_esg_HAFS_v0_hwrf_thompson_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3873,13 +3873,13 @@ Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 397.519750
+The total amount of wall time                        = 396.434516
 
 Test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfsv16_ugwpv1_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1_debug
 Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3938,13 +3938,13 @@ Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 604.477397
+The total amount of wall time                        = 602.823082
 
 Test 068 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/fv3_gfs_v16_ras_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_ras_debug
 Checking test 069 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4009,13 +4009,13 @@ Checking test 069 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 343.084605
+The total amount of wall time                        = 342.964276
 
 Test 069 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control
 Checking test 070 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4065,13 +4065,13 @@ Checking test 070 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 94.330202
+The total amount of wall time                        = 99.168593
 
 Test 070 cpld_control PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart
 Checking test 071 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4121,13 +4121,13 @@ Checking test 071 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 54.509987
+The total amount of wall time                        = 55.667218
 
 Test 071 cpld_restart PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac
 Checking test 072 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4177,13 +4177,13 @@ Checking test 072 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 97.537951
+The total amount of wall time                        = 95.002092
 
 Test 072 cpld_controlfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac
 Checking test 073 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4233,13 +4233,13 @@ Checking test 073 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 54.634580
+The total amount of wall time                        = 54.074622
 
 Test 073 cpld_restartfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_2threads
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_2threads
 Checking test 074 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4289,13 +4289,13 @@ Checking test 074 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 260.143343
+The total amount of wall time                        = 259.441104
 
 Test 074 cpld_2threads PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_decomp
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_decomp
 Checking test 075 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4345,13 +4345,13 @@ Checking test 075 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 96.188274
+The total amount of wall time                        = 96.105468
 
 Test 075 cpld_decomp PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_satmedmf
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_satmedmf
 Checking test 076 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4401,13 +4401,13 @@ Checking test 076 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 95.901729
+The total amount of wall time                        = 93.120103
 
 Test 076 cpld_satmedmf PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_ca
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_ca
 Checking test 077 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4457,13 +4457,13 @@ Checking test 077 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 95.998523
+The total amount of wall time                        = 96.397273
 
 Test 077 cpld_ca PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_c192
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_c192
 Checking test 078 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4513,13 +4513,13 @@ Checking test 078 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 409.876274
+The total amount of wall time                        = 401.073510
 
 Test 078 cpld_control_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_c192
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_c192
 Checking test 079 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4569,13 +4569,13 @@ Checking test 079 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 288.008984
+The total amount of wall time                        = 289.528245
 
 Test 079 cpld_restart_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac_c192
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac_c192
 Checking test 080 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4625,13 +4625,13 @@ Checking test 080 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 408.893341
+The total amount of wall time                        = 410.274779
 
 Test 080 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac_c192
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac_c192
 Checking test 081 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4681,13 +4681,13 @@ Checking test 081 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 287.403359
+The total amount of wall time                        = 292.162685
 
 Test 081 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_c384
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_c384
 Checking test 082 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4740,13 +4740,13 @@ Checking test 082 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1600.512764
+The total amount of wall time                        = 1575.556051
 
 Test 082 cpld_control_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_c384
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_c384
 Checking test 083 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4799,13 +4799,13 @@ Checking test 083 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 839.420761
+The total amount of wall time                        = 842.742485
 
 Test 083 cpld_restart_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_controlfrac_c384
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac_c384
 Checking test 084 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4858,13 +4858,13 @@ Checking test 084 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1591.439482
+The total amount of wall time                        = 1588.019550
 
 Test 084 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restartfrac_c384
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac_c384
 Checking test 085 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4917,13 +4917,13 @@ Checking test 085 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 832.477485
+The total amount of wall time                        = 828.257714
 
 Test 085 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmark
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmark
 Checking test 086 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4976,13 +4976,13 @@ Checking test 086 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 910.591583
+The total amount of wall time                        = 911.514819
 
 Test 086 cpld_bmark PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmark
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmark
 Checking test 087 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5035,13 +5035,13 @@ Checking test 087 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 492.644072
+The total amount of wall time                        = 493.418354
 
 Test 087 cpld_restart_bmark PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac
 Checking test 088 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5094,13 +5094,13 @@ Checking test 088 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 942.768192
+The total amount of wall time                        = 915.905406
 
 Test 088 cpld_bmarkfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmarkfrac
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmarkfrac
 Checking test 089 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5153,13 +5153,13 @@ Checking test 089 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 490.677498
+The total amount of wall time                        = 491.543561
 
 Test 089 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_v16
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_v16
 Checking test 090 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5212,13 +5212,13 @@ Checking test 090 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 1619.458789
+The total amount of wall time                        = 1639.823971
 
 Test 090 cpld_bmarkfrac_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_restart_bmarkfrac_v16
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmarkfrac_v16
 Checking test 091 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5271,13 +5271,13 @@ Checking test 091 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 876.345179
+The total amount of wall time                        = 867.579293
 
 Test 091 cpld_restart_bmarkfrac_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark_wave
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmark_wave
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmark_wave
 Checking test 092 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5333,13 +5333,13 @@ Checking test 092 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1579.004437
+The total amount of wall time                        = 1525.613086
 
 Test 092 cpld_bmark_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_wave
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_wave
 Checking test 093 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5395,13 +5395,13 @@ Checking test 093 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1564.991092
+The total amount of wall time                        = 1582.184637
 
 Test 093 cpld_bmarkfrac_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave_v16
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_bmarkfrac_wave_v16
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_wave_v16
 Checking test 094 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5456,13 +5456,13 @@ Checking test 094 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-The total amount of wall time                        = 1037.828157
+The total amount of wall time                        = 1046.151554
 
 Test 094 cpld_bmarkfrac_wave_v16 PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_wave
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_control_wave
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_wave
 Checking test 095 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5515,13 +5515,13 @@ Checking test 095 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-The total amount of wall time                        = 813.195210
+The total amount of wall time                        = 808.664644
 
 Test 095 cpld_control_wave PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_debug
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_debug
 Checking test 096 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5571,13 +5571,13 @@ Checking test 096 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 310.532484
+The total amount of wall time                        = 306.754779
 
 Test 096 cpld_debug PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/cpld_debugfrac
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_debugfrac
 Checking test 097 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5627,73 +5627,73 @@ Checking test 097 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 305.075755
+The total amount of wall time                        = 305.357800
 
 Test 097 cpld_debugfrac PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_control_cfsr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_control_cfsr
 Checking test 098 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 102.179644
+The total amount of wall time                        = 102.539148
 
 Test 098 datm_control_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_restart_cfsr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_restart_cfsr
 Checking test 099 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 61.928971
+The total amount of wall time                        = 64.278362
 
 Test 099 datm_restart_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_control_gefs
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_control_gefs
 Checking test 100 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 95.586184
+The total amount of wall time                        = 96.288880
 
 Test 100 datm_control_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_bulk_cfsr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_bulk_cfsr
 Checking test 101 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 98.097471
+The total amount of wall time                        = 98.708313
 
 Test 101 datm_bulk_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_bulk_gefs
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_bulk_gefs
 Checking test 102 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 96.061119
+The total amount of wall time                        = 93.157359
 
 Test 102 datm_bulk_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_mx025_cfsr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_mx025_cfsr
 Checking test 103 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5702,13 +5702,13 @@ Checking test 103 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 391.962767
+The total amount of wall time                        = 377.314568
 
 Test 103 datm_mx025_cfsr PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_mx025_gefs
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_mx025_gefs
 Checking test 104 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5717,23 +5717,23 @@ Checking test 104 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 389.212635
+The total amount of wall time                        = 390.675084
 
 Test 104 datm_mx025_gefs PASS
 
 
-baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
-working dir  = /glade/scratch/heinzell/FV3_RT/rt_37681/datm_debug_cfsr
+baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
+working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_debug_cfsr
 Checking test 105 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 286.252814
+The total amount of wall time                        = 285.156024
 
 Test 105 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 16:56:57 MDT 2021
-Elapsed time: 01h:56m:42s. Have a nice day!
+Thu Mar 18 15:08:27 MDT 2021
+Elapsed time: 01h:48m:46s. Have a nice day!
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
index b577ab36e8..88b99b94a6 100644
--- a/tests/RegressionTests_gaea.intel.log
+++ b/tests/RegressionTests_gaea.intel.log
@@ -1,9 +1,9 @@
-Wed Mar 17 15:32:59 EDT 2021
+Thu Mar 18 14:02:42 EDT 2021
 Start Regression test
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +68,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.485374
+The total amount of wall time                        = 58.173925
 
 Test 001 fv3_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_decomp
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +139,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 72.102716
+The total amount of wall time                        = 77.669375
 
 Test 002 fv3_decomp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_2threads
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +210,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 56.773568
+The total amount of wall time                        = 57.378820
 
 Test 003 fv3_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_restart
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +263,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 21.193289
+The total amount of wall time                        = 51.109880
 
 Test 004 fv3_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_read_inc
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +334,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 41.536547
+The total amount of wall time                        = 69.991447
 
 Test 005 fv3_read_inc PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf_esmf
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +385,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.242622
+The total amount of wall time                        = 118.327474
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +436,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 73.005528
+The total amount of wall time                        = 65.565436
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_netcdf_parallel
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -487,13 +487,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 62.012410
+The total amount of wall time                        = 118.454508
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGlatlon_netcdf
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +538,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 67.968061
+The total amount of wall time                        = 40.285961
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_nemsio
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +589,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 92.057050
+The total amount of wall time                        = 69.056323
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_wrtGauss_nemsio_c192
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +640,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.756012
+The total amount of wall time                        = 148.154030
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stochy
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +711,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.024480
+The total amount of wall time                        = 53.992756
 
 Test 012 fv3_stochy PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_ca
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +782,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 29.883390
+The total amount of wall time                        = 85.120918
 
 Test 013 fv3_ca PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_lndp
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +853,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.541476
+The total amount of wall time                        = 55.435999
 
 Test 014 fv3_lndp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_iau
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +924,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 67.247275
+The total amount of wall time                        = 69.747564
 
 Test 015 fv3_iau PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_lheatstrg
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +975,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.819128
+The total amount of wall time                        = 39.620394
 
 Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_multigases_repro
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_multigases_repro
 Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1052,13 @@ Checking test 017 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 98.505522
+The total amount of wall time                        = 93.531560
 
 Test 017 fv3_multigases PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control_32bit
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control_32bit
 Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1123,13 +1123,13 @@ Checking test 018 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 39.663154
+The total amount of wall time                        = 74.532582
 
 Test 018 fv3_control_32bit PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched
 Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1182,13 +1182,13 @@ Checking test 019 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 332.390533
+The total amount of wall time                        = 303.026302
 
 Test 019 fv3_stretched PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched_nest
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched_nest
 Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1252,13 +1252,13 @@ Checking test 020 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 363.772572
+The total amount of wall time                        = 333.078656
 
 Test 020 fv3_stretched_nest PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_control
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_control
 Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1266,25 +1266,25 @@ Checking test 021 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 671.029829
+The total amount of wall time                        = 672.510765
 
 Test 021 fv3_regional_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_restart
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_restart
 Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 368.134453
+The total amount of wall time                        = 367.874886
 
 Test 022 fv3_regional_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt
 Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1295,13 +1295,13 @@ Checking test 023 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 692.031281
+The total amount of wall time                        = 693.509027
 
 Test 023 fv3_regional_quilt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt_hafs
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt_hafs
 Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1310,13 +1310,13 @@ Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 688.414005
+The total amount of wall time                        = 688.758619
 
 Test 024 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_quilt_netcdf_parallel
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt_netcdf_parallel
 Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
@@ -1324,13 +1324,13 @@ Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
 
-The total amount of wall time                        = 691.740751
+The total amount of wall time                        = 692.256162
 
 Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmp
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmp
 Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1375,13 +1375,13 @@ Checking test 026 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 75.604375
+The total amount of wall time                        = 52.829686
 
 Test 026 fv3_gfdlmp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_gwd
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_gwd
 Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1426,13 +1426,13 @@ Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.142772
+The total amount of wall time                        = 46.787917
 
 Test 027 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_noahmp
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_noahmp
 Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1477,13 +1477,13 @@ Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.771940
+The total amount of wall time                        = 47.856230
 
 Test 028 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_csawmg
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_csawmg
 Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1528,13 +1528,13 @@ Checking test 029 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 149.960741
+The total amount of wall time                        = 124.446355
 
 Test 029 fv3_csawmg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_satmedmf
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_satmedmf
 Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1579,13 +1579,13 @@ Checking test 030 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 79.670296
+The total amount of wall time                        = 81.529699
 
 Test 030 fv3_satmedmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_satmedmfq
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_satmedmfq
 Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1630,13 +1630,13 @@ Checking test 031 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.506543
+The total amount of wall time                        = 53.994321
 
 Test 031 fv3_satmedmfq PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmp_32bit
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmp_32bit
 Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1681,13 +1681,13 @@ Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.878808
+The total amount of wall time                        = 45.413532
 
 Test 032 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfdlmprad_32bit_post
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_32bit_post
 Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1736,13 +1736,13 @@ Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 77.396202
+The total amount of wall time                        = 109.161842
 
 Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_cpt
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_cpt
 Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1793,13 +1793,13 @@ Checking test 034 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 288.651895
+The total amount of wall time                        = 295.095030
 
 Test 034 fv3_cpt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd
 Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1888,13 @@ Checking test 035 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 192.839897
+The total amount of wall time                        = 196.933302
 
 Test 035 fv3_gsd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rap
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rap
 Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1959,13 @@ Checking test 036 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.174180
+The total amount of wall time                        = 94.009529
 
 Test 036 fv3_rap PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_hrrr
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_hrrr
 Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2030,13 @@ Checking test 037 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.171670
+The total amount of wall time                        = 127.447812
 
 Test 037 fv3_hrrr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson
 Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2101,13 +2101,13 @@ Checking test 038 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 90.491086
+The total amount of wall time                        = 118.252587
 
 Test 038 fv3_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_no_aero
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_no_aero
 Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2172,13 +2172,13 @@ Checking test 039 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 85.585007
+The total amount of wall time                        = 143.020293
 
 Test 039 fv3_thompson_no_aero PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rrfs_v1beta
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rrfs_v1beta
 Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2243,13 +2243,13 @@ Checking test 040 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 120.673515
+The total amount of wall time                        = 102.168042
 
 Test 040 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2
 Checking test 041 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2314,13 +2314,13 @@ Checking test 041 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 129.877411
+The total amount of wall time                        = 129.212450
 
 Test 041 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16
 Checking test 042 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2397,13 +2397,13 @@ Checking test 042 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 145.397896
+The total amount of wall time                        = 116.339200
 
 Test 042 fv3_gfs_v16 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_restart
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_restart
 Checking test 043 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2450,13 +2450,13 @@ Checking test 043 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.858808
+The total amount of wall time                        = 75.138607
 
 Test 043 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_stochy
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_stochy
 Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2521,13 +2521,13 @@ Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 82.493794
+The total amount of wall time                        = 82.378238
 
 Test 044 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_RRTMGP
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_RRTMGP
 Checking test 045 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2592,13 +2592,13 @@ Checking test 045 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.233689
+The total amount of wall time                        = 175.144328
 
 Test 045 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP
 Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2663,13 +2663,13 @@ Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 187.969992
+The total amount of wall time                        = 178.879686
 
 Test 046 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_c192L127
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2728,13 +2728,13 @@ Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 733.570211
+The total amount of wall time                        = 720.183361
 
 Test 047 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_2thrd
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2799,13 +2799,13 @@ Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 282.897222
+The total amount of wall time                        = 272.559145
 
 Test 048 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_csawmg
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_csawmg
 Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2850,13 +2850,13 @@ Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 132.452220
+The total amount of wall time                        = 135.174201
 
 Test 049 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_csawmgt
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_csawmgt
 Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2901,13 +2901,13 @@ Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.527004
+The total amount of wall time                        = 130.489969
 
 Test 050 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gocart_clm
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gocart_clm
 Checking test 051 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2952,13 +2952,13 @@ Checking test 051 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 56.881795
+The total amount of wall time                        = 52.544351
 
 Test 051 fv3_gocart_clm PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_flake
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_flake
 Checking test 052 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3023,13 +3023,13 @@ Checking test 052 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.827340
+The total amount of wall time                        = 110.543339
 
 Test 052 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_HAFS_v0_hwrf_thompson
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_HAFS_v0_hwrf_thompson
 Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3094,13 +3094,13 @@ Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 161.380788
+The total amount of wall time                        = 161.699485
 
 Test 053 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_esg_HAFS_v0_hwrf_thompson
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3115,13 +3115,13 @@ Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 310.000662
+The total amount of wall time                        = 297.153337
 
 Test 054 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1
 Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3180,13 +3180,13 @@ Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 184.639949
+The total amount of wall time                        = 184.919745
 
 Test 055 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1_warmstart
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1_warmstart
 Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3245,13 +3245,13 @@ Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 212.647393
+The total amount of wall time                        = 196.396511
 
 Test 056 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_ras
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_ras
 Checking test 057 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3316,13 +3316,13 @@ Checking test 057 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 128.544225
+The total amount of wall time                        = 100.193398
 
 Test 057 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_debug
 Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3387,13 +3387,13 @@ Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 235.095911
+The total amount of wall time                        = 227.452795
 
 Test 058 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_debug
 Checking test 059 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3458,13 +3458,13 @@ Checking test 059 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.460156
+The total amount of wall time                        = 169.959918
 
 Test 059 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v15p2_RRTMGP_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3529,13 +3529,13 @@ Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 374.563559
+The total amount of wall time                        = 364.400285
 
 Test 060 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_RRTMGP_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_debug
 Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3600,13 +3600,13 @@ Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 381.595627
+The total amount of wall time                        = 373.305128
 
 Test 061 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_regional_control_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_control_debug
 Checking test 062 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3614,13 +3614,13 @@ Checking test 062 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 367.593608
+The total amount of wall time                        = 366.383020
 
 Test 062 fv3_regional_control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_control_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control_debug
 Checking test 063 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3647,13 +3647,13 @@ Checking test 063 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 128.752562
+The total amount of wall time                        = 128.722369
 
 Test 063 fv3_control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_stretched_nest_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched_nest_debug
 Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3670,13 +3670,13 @@ Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 436.695048
+The total amount of wall time                        = 437.496081
 
 Test 064 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd_debug
 Checking test 065 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3741,13 +3741,13 @@ Checking test 065 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 227.074360
+The total amount of wall time                        = 196.713598
 
 Test 065 fv3_gsd_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gsd_diag3d_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd_diag3d_debug
 Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3812,13 +3812,13 @@ Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 224.236854
+The total amount of wall time                        = 217.697104
 
 Test 066 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_debug
 Checking test 067 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3883,13 +3883,13 @@ Checking test 067 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 340.075554
+The total amount of wall time                        = 340.529417
 
 Test 067 fv3_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_thompson_no_aero_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_no_aero_debug
 Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3954,13 +3954,13 @@ Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 329.845920
+The total amount of wall time                        = 327.741274
 
 Test 068 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_rrfs_v1beta_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rrfs_v1beta_debug
 Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4025,13 +4025,13 @@ Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 188.889830
+The total amount of wall time                        = 189.380950
 
 Test 069 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_HAFS_v0_hwrf_thompson_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4096,13 +4096,13 @@ Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 203.934209
+The total amount of wall time                        = 205.502659
 
 Test 070 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_esg_HAFS_v0_hwrf_thompson_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -4117,13 +4117,13 @@ Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 376.024082
+The total amount of wall time                        = 375.463604
 
 Test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfsv16_ugwpv1_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1_debug
 Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -4182,13 +4182,13 @@ Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 606.656985
+The total amount of wall time                        = 583.120481
 
 Test 072 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/fv3_gfs_v16_ras_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_ras_debug
 Checking test 073 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4253,13 +4253,13 @@ Checking test 073 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 350.677365
+The total amount of wall time                        = 322.960453
 
 Test 073 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control
 Checking test 074 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4309,13 +4309,13 @@ Checking test 074 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 120.457928
+The total amount of wall time                        = 96.066367
 
 Test 074 cpld_control PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart
 Checking test 075 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4365,13 +4365,13 @@ Checking test 075 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 50.718759
+The total amount of wall time                        = 80.916076
 
 Test 075 cpld_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac
 Checking test 076 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4421,13 +4421,13 @@ Checking test 076 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 120.677719
+The total amount of wall time                        = 103.398861
 
 Test 076 cpld_controlfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac
 Checking test 077 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4477,13 +4477,13 @@ Checking test 077 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 48.239807
+The total amount of wall time                        = 74.393433
 
 Test 077 cpld_restartfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_2threads
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_2threads
 Checking test 078 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4533,13 +4533,13 @@ Checking test 078 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 147.067040
+The total amount of wall time                        = 132.871286
 
 Test 078 cpld_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_decomp
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_decomp
 Checking test 079 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4589,13 +4589,13 @@ Checking test 079 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 90.314914
+The total amount of wall time                        = 91.193769
 
 Test 079 cpld_decomp PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_satmedmf
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_satmedmf
 Checking test 080 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4645,13 +4645,13 @@ Checking test 080 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 91.042473
+The total amount of wall time                        = 90.195777
 
 Test 080 cpld_satmedmf PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_ca
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_ca
 Checking test 081 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4701,13 +4701,13 @@ Checking test 081 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 121.001866
+The total amount of wall time                        = 109.883565
 
 Test 081 cpld_ca PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control_c192
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control_c192
 Checking test 082 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4757,13 +4757,13 @@ Checking test 082 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 407.757892
+The total amount of wall time                        = 411.594599
 
 Test 082 cpld_control_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_c192
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_c192
 Checking test 083 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4813,13 +4813,13 @@ Checking test 083 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 307.998223
+The total amount of wall time                        = 287.980100
 
 Test 083 cpld_restart_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac_c192
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac_c192
 Checking test 084 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4869,13 +4869,13 @@ Checking test 084 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 406.897365
+The total amount of wall time                        = 412.493013
 
 Test 084 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac_c192
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac_c192
 Checking test 085 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4925,13 +4925,13 @@ Checking test 085 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 323.773810
+The total amount of wall time                        = 310.823757
 
 Test 085 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_control_c384
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control_c384
 Checking test 086 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4984,13 +4984,13 @@ Checking test 086 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1521.958534
+The total amount of wall time                        = 1529.454292
 
 Test 086 cpld_control_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_c384
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_c384
 Checking test 087 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5043,13 +5043,13 @@ Checking test 087 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 773.748556
+The total amount of wall time                        = 776.811556
 
 Test 087 cpld_restart_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_controlfrac_c384
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac_c384
 Checking test 088 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5102,13 +5102,13 @@ Checking test 088 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1532.686150
+The total amount of wall time                        = 1513.024381
 
 Test 088 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restartfrac_c384
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac_c384
 Checking test 089 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5161,13 +5161,13 @@ Checking test 089 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 766.519234
+The total amount of wall time                        = 775.324726
 
 Test 089 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_bmark
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_bmark
 Checking test 090 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5220,13 +5220,13 @@ Checking test 090 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 881.501054
+The total amount of wall time                        = 891.937549
 
 Test 090 cpld_bmark PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_bmark
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_bmark
 Checking test 091 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5279,13 +5279,13 @@ Checking test 091 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 453.189565
+The total amount of wall time                        = 456.077376
 
 Test 091 cpld_restart_bmark PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_bmarkfrac
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_bmarkfrac
 Checking test 092 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5338,13 +5338,13 @@ Checking test 092 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 859.231561
+The total amount of wall time                        = 877.482866
 
 Test 092 cpld_bmarkfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_restart_bmarkfrac
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_bmarkfrac
 Checking test 093 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5397,13 +5397,13 @@ Checking test 093 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 447.852029
+The total amount of wall time                        = 458.318475
 
 Test 093 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_debug
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_debug
 Checking test 094 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5453,13 +5453,13 @@ Checking test 094 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 261.103150
+The total amount of wall time                        = 264.028391
 
 Test 094 cpld_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/cpld_debugfrac
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_debugfrac
 Checking test 095 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5509,73 +5509,73 @@ Checking test 095 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 287.770841
+The total amount of wall time                        = 270.464542
 
 Test 095 cpld_debugfrac PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_control_cfsr
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_control_cfsr
 Checking test 096 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 97.793800
+The total amount of wall time                        = 99.886181
 
 Test 096 datm_control_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_restart_cfsr
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_restart_cfsr
 Checking test 097 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 69.735499
+The total amount of wall time                        = 62.137315
 
 Test 097 datm_restart_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_control_gefs
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_control_gefs
 Checking test 098 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 95.204006
+The total amount of wall time                        = 95.549332
 
 Test 098 datm_control_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_bulk_cfsr
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_bulk_cfsr
 Checking test 099 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 114.196027
+The total amount of wall time                        = 95.883983
 
 Test 099 datm_bulk_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_bulk_gefs
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_bulk_gefs
 Checking test 100 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 94.867519
+The total amount of wall time                        = 98.449456
 
 Test 100 datm_bulk_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_mx025_gefs
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_mx025_gefs
 Checking test 101 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5584,23 +5584,23 @@ Checking test 101 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 386.640594
+The total amount of wall time                        = 448.897550
 
 Test 101 datm_mx025_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
-working dir  = /lustre/f2/scratch/Dom.Heinzeller/FV3_RT/rt_34833/datm_debug_cfsr
+baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_debug_cfsr
 Checking test 102 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 253.835049
+The total amount of wall time                        = 247.861378
 
 Test 102 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 16:50:27 EDT 2021
-Elapsed time: 01h:17m:29s. Have a nice day!
+Thu Mar 18 15:28:43 EDT 2021
+Elapsed time: 01h:26m:02s. Have a nice day!
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
index d0c0d71d6c..9136f2f100 100644
--- a/tests/RegressionTests_hera.gnu.log
+++ b/tests/RegressionTests_hera.gnu.log
@@ -1,9 +1,9 @@
-Wed Mar 17 21:02:21 UTC 2021
+Fri Mar 19 16:32:02 UTC 2021
 Start Regression test
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfdlmp
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfdlmp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfdlmp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfdlmp
 Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -48,13 +48,13 @@ Checking test 001 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 230.221815
+  0: The total amount of wall time                        = 237.471537
 
 Test 001 fv3_gfdlmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2
 Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -119,13 +119,13 @@ Checking test 002 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 575.623872
+  0: The total amount of wall time                        = 675.469331
 
 Test 002 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16
 Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -202,13 +202,13 @@ Checking test 003 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 599.253044
+  0: The total amount of wall time                        = 644.481194
 
 Test 003 fv3_gfs_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_restart
 Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -255,13 +255,13 @@ Checking test 004 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 298.897952
+  0: The total amount of wall time                        = 293.565687
 
 Test 004 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_stochy
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_stochy
 Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -326,13 +326,13 @@ Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 408.934031
+  0: The total amount of wall time                        = 403.710703
 
 Test 005 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_flake
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_flake
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_flake
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_flake
 Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -397,13 +397,13 @@ Checking test 006 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 651.896884
+  0: The total amount of wall time                        = 674.892521
 
 Test 006 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_RRTMGP
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_RRTMGP
 Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -468,13 +468,13 @@ Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 718.716919
+  0: The total amount of wall time                        = 758.831205
 
 Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_RRTMGP
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_RRTMGP
 Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -539,13 +539,13 @@ Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 743.681647
+  0: The total amount of wall time                        = 764.434046
 
 Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gsd
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gsd
 Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -634,13 +634,13 @@ Checking test 009 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 881.051197
+  0: The total amount of wall time                        = 846.078479
 
 Test 009 fv3_gsd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson
 Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -705,13 +705,13 @@ Checking test 010 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 398.364665
+  0: The total amount of wall time                        = 430.229886
 
 Test 010 fv3_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_no_aero
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_no_aero
 Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -776,13 +776,13 @@ Checking test 011 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 399.138654
+  0: The total amount of wall time                        = 387.260332
 
 Test 011 fv3_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_rrfs_v1beta
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_rrfs_v1beta
 Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -847,13 +847,13 @@ Checking test 012 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 399.585865
+  0: The total amount of wall time                        = 443.446092
 
 Test 012 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_HAFS_v0_hwrf_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_HAFS_v0_hwrf_thompson
 Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -918,13 +918,13 @@ Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 628.560364
+  0: The total amount of wall time                        = 640.029604
 
 Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_esg_HAFS_v0_hwrf_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -939,13 +939,13 @@ Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 443.604429
+ 0: The total amount of wall time                        = 450.842489
 
 Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1
 Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1004,13 +1004,13 @@ Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 908.532238
+  0: The total amount of wall time                        = 901.591014
 
 Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1_warmstart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1_warmstart
 Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1069,13 +1069,13 @@ Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 923.398587
+  0: The total amount of wall time                        = 917.105238
 
 Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_ras
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_ras
 Checking test 017 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1140,13 +1140,13 @@ Checking test 017 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 608.975806
+  0: The total amount of wall time                        = 574.592917
 
 Test 017 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_control_debug
 Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1173,13 +1173,13 @@ Checking test 018 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 88.625162
+  0: The total amount of wall time                        = 84.997363
 
 Test 018 fv3_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_regional_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_regional_control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_regional_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_regional_control_debug
 Checking test 019 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1187,13 +1187,13 @@ Checking test 019 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 168.838854
+ 0: The total amount of wall time                        = 172.290542
 
 Test 019 fv3_regional_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_rrfs_v1beta_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_rrfs_v1beta_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_rrfs_v1beta_debug
 Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1258,13 +1258,13 @@ Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 120.986153
+  0: The total amount of wall time                        = 118.870100
 
 Test 020 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gsd_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gsd_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gsd_debug
 Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1329,13 +1329,13 @@ Checking test 021 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 122.324768
+  0: The total amount of wall time                        = 121.813272
 
 Test 021 fv3_gsd_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_debug
 Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1400,13 +1400,13 @@ Checking test 022 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 203.342459
+  0: The total amount of wall time                        = 200.768902
 
 Test 022 fv3_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_thompson_no_aero_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_thompson_no_aero_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_no_aero_debug
 Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1471,13 +1471,13 @@ Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 197.439857
+  0: The total amount of wall time                        = 192.773701
 
 Test 023 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_debug
 Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1542,13 +1542,13 @@ Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 275.837348
+  0: The total amount of wall time                        = 296.726170
 
 Test 024 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_debug
 Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1613,13 +1613,13 @@ Checking test 025 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 132.082633
+  0: The total amount of wall time                        = 127.074768
 
 Test 025 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v15p2_RRTMGP_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1684,13 @@ Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 325.547437
+  0: The total amount of wall time                        = 327.302773
 
 Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_RRTMGP_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_RRTMGP_debug
 Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1755,13 +1755,13 @@ Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 311.887452
+  0: The total amount of wall time                        = 354.534815
 
 Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_multigases
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_multigases
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_multigases
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_multigases
 Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1832,13 +1832,13 @@ Checking test 028 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 441.145451
+  0: The total amount of wall time                        = 420.499654
 
 Test 028 fv3_multigases PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_HAFS_v0_hwrf_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1903,13 +1903,13 @@ Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 133.935288
+  0: The total amount of wall time                        = 132.677680
 
 Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_esg_HAFS_v0_hwrf_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1924,13 +1924,13 @@ Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 224.800982
+ 0: The total amount of wall time                        = 227.660754
 
 Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfsv16_ugwpv1_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfsv16_ugwpv1_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1_debug
 Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1989,13 +1989,13 @@ Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 391.575539
+  0: The total amount of wall time                        = 391.564759
 
 Test 031 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/GNU/fv3_gfs_v16_ras_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_42883/fv3_gfs_v16_ras_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_ras_debug
 Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2060,11 +2060,11 @@ Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 219.115575
+  0: The total amount of wall time                        = 219.969998
 
 Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 21:28:59 UTC 2021
-Elapsed time: 00h:26m:39s. Have a nice day!
+Fri Mar 19 19:23:01 UTC 2021
+Elapsed time: 02h:50m:59s. Have a nice day!
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
index eeb5727b00..664939a3ff 100644
--- a/tests/RegressionTests_hera.intel.log
+++ b/tests/RegressionTests_hera.intel.log
@@ -1,9 +1,9 @@
-Wed Mar 17 20:53:57 UTC 2021
+Fri Mar 19 15:56:08 UTC 2021
 Start Regression test
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +68,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 39.984777
+  0: The total amount of wall time                        = 39.366954
 
 Test 001 fv3_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_decomp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +139,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 40.778737
+  0: The total amount of wall time                        = 40.042910
 
 Test 002 fv3_decomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_2threads
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +210,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 41.434267
+ 0: The total amount of wall time                        = 41.787880
 
 Test 003 fv3_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +263,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 18.898729
+  0: The total amount of wall time                        = 19.759936
 
 Test 004 fv3_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_read_inc
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +334,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.456500
+  0: The total amount of wall time                        = 36.350124
 
 Test 005 fv3_read_inc PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf_esmf
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +385,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 111.429769
+  0: The total amount of wall time                        = 109.973546
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +436,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 38.158742
+  0: The total amount of wall time                        = 37.412712
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_netcdf_parallel
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -450,7 +450,7 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile4.nc .........OK
  Comparing atmos_4xdaily.tile5.nc .........OK
  Comparing atmos_4xdaily.tile6.nc .........OK
- Comparing phyf000.nc .........OK
+ Comparing phyf000.nc ............ALT CHECK......OK
  Comparing phyf024.nc ............ALT CHECK......OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc ............ALT CHECK......OK
@@ -487,13 +487,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 48.224545
+  0: The total amount of wall time                        = 47.306747
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGlatlon_netcdf
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +538,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 37.504070
+  0: The total amount of wall time                        = 36.743012
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +589,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.951184
+  0: The total amount of wall time                        = 36.238317
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio_c192
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +640,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 95.861372
+  0: The total amount of wall time                        = 96.443016
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stochy
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +711,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 41.037955
+  0: The total amount of wall time                        = 41.237996
 
 Test 012 fv3_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_ca
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +782,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 26.848782
+  0: The total amount of wall time                        = 25.717263
 
 Test 013 fv3_ca PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_lndp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +853,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.912846
+  0: The total amount of wall time                        = 43.449009
 
 Test 014 fv3_lndp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_iau
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +924,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.950534
+  0: The total amount of wall time                        = 36.585567
 
 Test 015 fv3_iau PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_lheatstrg
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +975,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.682170
+  0: The total amount of wall time                        = 36.734224
 
 Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad
 Checking test 017 fv3_gfdlmprad results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1027,13 +1027,13 @@ Checking test 017 fv3_gfdlmprad results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 647.779269
+  0: The total amount of wall time                        = 648.749887
 
 Test 017 fv3_gfdlmprad PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_atmwav
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_atmwav
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_atmwav
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_atmwav
 Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1079,13 +1079,13 @@ Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 795.365042
+  0: The total amount of wall time                        = 794.961885
 
 Test 018 fv3_gfdlmprad_atmwav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c768
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_wrtGauss_nemsio_c768
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c768
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio_c768
 Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1131,13 +1131,13 @@ Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing out_grd.ant_9km .........OK
  Comparing out_grd.aoc_9km .........OK
 
-   0: The total amount of wall time                        = 674.318096
+   0: The total amount of wall time                        = 680.930308
 
 Test 019 fv3_wrtGauss_nemsio_c768 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_multigases_repro
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_multigases_repro
 Checking test 020 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1208,13 +1208,13 @@ Checking test 020 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 94.344276
+  0: The total amount of wall time                        = 94.288968
 
 Test 020 fv3_multigases PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control_32bit
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control_32bit
 Checking test 021 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1279,13 +1279,13 @@ Checking test 021 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 37.402951
+  0: The total amount of wall time                        = 35.895105
 
 Test 021 fv3_control_32bit PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched
 Checking test 022 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1338,13 +1338,13 @@ Checking test 022 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 225.504355
+ 0: The total amount of wall time                        = 219.544988
 
 Test 022 fv3_stretched PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched_nest
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched_nest
 Checking test 023 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1408,13 +1408,13 @@ Checking test 023 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
- 0: The total amount of wall time                        = 236.955976
+ 0: The total amount of wall time                        = 241.675102
 
 Test 023 fv3_stretched_nest PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_control
 Checking test 024 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1422,25 +1422,25 @@ Checking test 024 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 546.765215
+ 0: The total amount of wall time                        = 548.190531
 
 Test 024 fv3_regional_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_restart
 Checking test 025 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
- 0: The total amount of wall time                        = 302.067242
+ 0: The total amount of wall time                        = 302.533953
 
 Test 025 fv3_regional_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt
 Checking test 026 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1451,13 +1451,13 @@ Checking test 026 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 574.553838
+ 0: The total amount of wall time                        = 573.061955
 
 Test 026 fv3_regional_quilt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt_hafs
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt_hafs
 Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1466,13 +1466,13 @@ Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 574.746857
+ 0: The total amount of wall time                        = 572.216512
 
 Test 027 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_quilt_netcdf_parallel
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt_netcdf_parallel
 Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
@@ -1480,13 +1480,13 @@ Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 573.410316
+ 0: The total amount of wall time                        = 576.056927
 
 Test 028 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmp
 Checking test 029 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1531,13 +1531,13 @@ Checking test 029 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.617745
+  0: The total amount of wall time                        = 42.336905
 
 Test 029 fv3_gfdlmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_gwd
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_gwd
 Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1582,13 +1582,13 @@ Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.644786
+  0: The total amount of wall time                        = 42.847183
 
 Test 030 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_noahmp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_noahmp
 Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1633,13 +1633,13 @@ Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.722683
+  0: The total amount of wall time                        = 43.159585
 
 Test 031 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_csawmg
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_csawmg
 Checking test 032 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1684,13 @@ Checking test 032 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 107.398435
+  0: The total amount of wall time                        = 107.230208
 
 Test 032 fv3_csawmg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_satmedmf
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_satmedmf
 Checking test 033 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1735,13 +1735,13 @@ Checking test 033 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.666010
+  0: The total amount of wall time                        = 47.557898
 
 Test 033 fv3_satmedmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_satmedmfq
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_satmedmfq
 Checking test 034 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1786,13 +1786,13 @@ Checking test 034 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.544278
+  0: The total amount of wall time                        = 45.282295
 
 Test 034 fv3_satmedmfq PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmp_32bit
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmp_32bit
 Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1837,13 +1837,13 @@ Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 40.948125
+  0: The total amount of wall time                        = 36.633248
 
 Test 035 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfdlmprad_32bit_post
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_32bit_post
 Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1892,13 +1892,13 @@ Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 74.076119
+  0: The total amount of wall time                        = 72.571621
 
 Test 036 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_cpt
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_cpt
 Checking test 037 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1949,13 +1949,13 @@ Checking test 037 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 252.570449
+  0: The total amount of wall time                        = 253.276627
 
 Test 037 fv3_cpt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd
 Checking test 038 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2044,13 +2044,13 @@ Checking test 038 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 177.306962
+  0: The total amount of wall time                        = 177.512813
 
 Test 038 fv3_gsd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rap
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rap
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rap
 Checking test 039 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2115,13 +2115,13 @@ Checking test 039 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 87.164614
+  0: The total amount of wall time                        = 87.803927
 
 Test 039 fv3_rap PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_hrrr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_hrrr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_hrrr
 Checking test 040 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2186,13 +2186,13 @@ Checking test 040 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 95.376886
+  0: The total amount of wall time                        = 96.256129
 
 Test 040 fv3_hrrr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson
 Checking test 041 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2257,13 +2257,13 @@ Checking test 041 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 83.532451
+  0: The total amount of wall time                        = 84.610243
 
 Test 041 fv3_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_no_aero
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_no_aero
 Checking test 042 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2328,13 +2328,13 @@ Checking test 042 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 79.108371
+  0: The total amount of wall time                        = 80.016053
 
 Test 042 fv3_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rrfs_v1beta
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rrfs_v1beta
 Checking test 043 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2399,13 +2399,13 @@ Checking test 043 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 97.567700
+  0: The total amount of wall time                        = 97.763308
 
 Test 043 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2
 Checking test 044 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2470,13 +2470,13 @@ Checking test 044 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 91.850977
+  0: The total amount of wall time                        = 93.635316
 
 Test 044 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16
 Checking test 045 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2553,13 +2553,13 @@ Checking test 045 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 102.515385
+  0: The total amount of wall time                        = 102.081819
 
 Test 045 fv3_gfs_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_restart
 Checking test 046 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2606,13 +2606,13 @@ Checking test 046 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.055160
+  0: The total amount of wall time                        = 54.023024
 
 Test 046 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_stochy
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_stochy
 Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2677,13 +2677,13 @@ Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.100106
+  0: The total amount of wall time                        = 46.823884
 
 Test 047 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_RRTMGP
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_RRTMGP
 Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2748,13 +2748,13 @@ Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 153.246460
+  0: The total amount of wall time                        = 155.682140
 
 Test 048 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP
 Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2819,13 +2819,13 @@ Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 156.436174
+  0: The total amount of wall time                        = 165.211830
 
 Test 049 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_c192L127
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2884,13 +2884,13 @@ Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 624.869992
+  0: The total amount of wall time                        = 621.071081
 
 Test 050 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_2thrd
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2955,13 +2955,13 @@ Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 175.662028
+ 0: The total amount of wall time                        = 171.747147
 
 Test 051 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_csawmg
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_csawmg
 Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3006,13 +3006,13 @@ Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 114.438854
+  0: The total amount of wall time                        = 114.605300
 
 Test 052 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_csawmgt
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_csawmgt
 Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3057,13 +3057,13 @@ Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 112.480343
+  0: The total amount of wall time                        = 112.926929
 
 Test 053 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gocart_clm
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gocart_clm
 Checking test 054 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3108,13 +3108,13 @@ Checking test 054 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.884791
+  0: The total amount of wall time                        = 46.699732
 
 Test 054 fv3_gocart_clm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_flake
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_flake
 Checking test 055 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3179,13 +3179,13 @@ Checking test 055 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 94.609762
+  0: The total amount of wall time                        = 97.267533
 
 Test 055 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_HAFS_v0_hwrf_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_HAFS_v0_hwrf_thompson
 Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3250,13 +3250,13 @@ Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 141.396630
+  0: The total amount of wall time                        = 141.251279
 
 Test 056 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_esg_HAFS_v0_hwrf_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3271,13 +3271,13 @@ Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 280.570341
+ 0: The total amount of wall time                        = 279.445435
 
 Test 057 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1
 Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3336,13 +3336,13 @@ Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 163.168728
+  0: The total amount of wall time                        = 162.403031
 
 Test 058 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1_warmstart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1_warmstart
 Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3401,13 +3401,13 @@ Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 164.991385
+  0: The total amount of wall time                        = 164.604458
 
 Test 059 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_ras
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_ras
 Checking test 060 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3472,13 +3472,13 @@ Checking test 060 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 88.093064
+  0: The total amount of wall time                        = 87.473920
 
 Test 060 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_debug
 Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3543,13 +3543,13 @@ Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 227.023364
+  0: The total amount of wall time                        = 225.572325
 
 Test 061 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_debug
 Checking test 062 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3614,13 +3614,13 @@ Checking test 062 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 170.542628
+  0: The total amount of wall time                        = 173.296381
 
 Test 062 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v15p2_RRTMGP_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3685,13 +3685,13 @@ Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 343.080931
+  0: The total amount of wall time                        = 348.706433
 
 Test 063 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_RRTMGP_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_debug
 Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3756,13 +3756,13 @@ Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 350.730465
+  0: The total amount of wall time                        = 347.673806
 
 Test 064 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_regional_control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_control_debug
 Checking test 065 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3770,13 +3770,13 @@ Checking test 065 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 343.648586
+ 0: The total amount of wall time                        = 353.505385
 
 Test 065 fv3_regional_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control_debug
 Checking test 066 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3803,13 +3803,13 @@ Checking test 066 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 131.367273
+  0: The total amount of wall time                        = 132.647365
 
 Test 066 fv3_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_stretched_nest_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched_nest_debug
 Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3826,13 +3826,13 @@ Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 353.115307
+ 0: The total amount of wall time                        = 352.899196
 
 Test 067 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd_debug
 Checking test 068 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3897,13 +3897,13 @@ Checking test 068 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 198.377431
+  0: The total amount of wall time                        = 197.568431
 
 Test 068 fv3_gsd_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gsd_diag3d_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd_diag3d_debug
 Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3968,13 +3968,13 @@ Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 250.833859
+  0: The total amount of wall time                        = 250.595468
 
 Test 069 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_debug
 Checking test 070 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4039,13 +4039,13 @@ Checking test 070 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 328.146694
+  0: The total amount of wall time                        = 333.573337
 
 Test 070 fv3_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_thompson_no_aero_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_no_aero_debug
 Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4110,13 +4110,13 @@ Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 316.827349
+  0: The total amount of wall time                        = 317.647750
 
 Test 071 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_rrfs_v1beta_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rrfs_v1beta_debug
 Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4181,13 +4181,13 @@ Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 189.821750
+  0: The total amount of wall time                        = 192.390696
 
 Test 072 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_HAFS_v0_hwrf_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4252,13 +4252,13 @@ Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 201.618230
+  0: The total amount of wall time                        = 203.404709
 
 Test 073 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_esg_HAFS_v0_hwrf_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -4273,13 +4273,13 @@ Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 374.293835
+ 0: The total amount of wall time                        = 380.261543
 
 Test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfsv16_ugwpv1_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1_debug
 Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -4338,13 +4338,13 @@ Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 542.635850
+  0: The total amount of wall time                        = 542.538902
 
 Test 075 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/fv3_gfs_v16_ras_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_ras_debug
 Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4409,13 +4409,13 @@ Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 309.132295
+  0: The total amount of wall time                        = 320.026427
 
 Test 076 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control
 Checking test 077 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4465,13 +4465,13 @@ Checking test 077 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 90.339128
+  0: The total amount of wall time                        = 89.492388
 
 Test 077 cpld_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart
 Checking test 078 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4521,13 +4521,13 @@ Checking test 078 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 54.768869
+  0: The total amount of wall time                        = 52.752001
 
 Test 078 cpld_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac
 Checking test 079 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4577,13 +4577,13 @@ Checking test 079 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 95.907851
+  0: The total amount of wall time                        = 89.156218
 
 Test 079 cpld_controlfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac
 Checking test 080 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4633,13 +4633,13 @@ Checking test 080 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 55.511067
+  0: The total amount of wall time                        = 54.839990
 
 Test 080 cpld_restartfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_2threads
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_2threads
 Checking test 081 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4689,13 +4689,13 @@ Checking test 081 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 110.409809
+  0: The total amount of wall time                        = 109.331295
 
 Test 081 cpld_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_decomp
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_decomp
 Checking test 082 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4745,13 +4745,13 @@ Checking test 082 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 88.728218
+  0: The total amount of wall time                        = 86.886875
 
 Test 082 cpld_decomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_satmedmf
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_satmedmf
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_satmedmf
 Checking test 083 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4801,13 +4801,13 @@ Checking test 083 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 87.231026
+  0: The total amount of wall time                        = 86.736219
 
 Test 083 cpld_satmedmf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_ca
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_ca
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_ca
 Checking test 084 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4857,13 +4857,13 @@ Checking test 084 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 87.981922
+  0: The total amount of wall time                        = 86.330204
 
 Test 084 cpld_ca PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_c192
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_c192
 Checking test 085 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4913,13 +4913,13 @@ Checking test 085 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 375.367746
+  0: The total amount of wall time                        = 375.102929
 
 Test 085 cpld_control_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c192
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_c192
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_c192
 Checking test 086 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4969,13 +4969,13 @@ Checking test 086 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 270.814211
+  0: The total amount of wall time                        = 271.849544
 
 Test 086 cpld_restart_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac_c192
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac_c192
 Checking test 087 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5025,13 +5025,13 @@ Checking test 087 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 373.279468
+  0: The total amount of wall time                        = 376.076936
 
 Test 087 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c192
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac_c192
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac_c192
 Checking test 088 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5081,13 +5081,13 @@ Checking test 088 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 266.135016
+  0: The total amount of wall time                        = 261.680954
 
 Test 088 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_c384
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_c384
 Checking test 089 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5140,13 +5140,13 @@ Checking test 089 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1329.110627
+  0: The total amount of wall time                        = 1310.415571
 
 Test 089 cpld_control_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_c384
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_c384
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_c384
 Checking test 090 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5199,13 +5199,13 @@ Checking test 090 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 696.887685
+  0: The total amount of wall time                        = 699.923037
 
 Test 090 cpld_restart_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_controlfrac_c384
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac_c384
 Checking test 091 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5258,13 +5258,13 @@ Checking test 091 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1312.699512
+  0: The total amount of wall time                        = 1312.460118
 
 Test 091 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_controlfrac_c384
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restartfrac_c384
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac_c384
 Checking test 092 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5317,13 +5317,13 @@ Checking test 092 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 695.786189
+  0: The total amount of wall time                        = 694.840528
 
 Test 092 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmark
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmark
 Checking test 093 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5376,13 +5376,13 @@ Checking test 093 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 822.009683
+  0: The total amount of wall time                        = 797.868408
 
 Test 093 cpld_bmark PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmark
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmark
 Checking test 094 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5435,13 +5435,13 @@ Checking test 094 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 455.656186
+  0: The total amount of wall time                        = 456.416099
 
 Test 094 cpld_restart_bmark PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac
 Checking test 095 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5494,13 +5494,13 @@ Checking test 095 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 819.301220
+  0: The total amount of wall time                        = 786.716243
 
 Test 095 cpld_bmarkfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmarkfrac
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmarkfrac
 Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5553,13 +5553,13 @@ Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 450.464189
+  0: The total amount of wall time                        = 446.217410
 
 Test 096 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_v16
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_v16
 Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5612,13 +5612,13 @@ Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 1305.824498
+  0: The total amount of wall time                        = 1306.615833
 
 Test 097 cpld_bmarkfrac_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_restart_bmarkfrac_v16
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmarkfrac_v16
 Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5671,13 +5671,13 @@ Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 736.928195
+  0: The total amount of wall time                        = 720.890251
 
 Test 098 cpld_restart_bmarkfrac_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmark_wave
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmark_wave
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmark_wave
 Checking test 099 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5733,13 +5733,13 @@ Checking test 099 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1371.881760
+  0: The total amount of wall time                        = 1342.795970
 
 Test 099 cpld_bmark_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_wave
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_wave
 Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5795,13 +5795,13 @@ Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1367.920208
+  0: The total amount of wall time                        = 1352.035957
 
 Test 100 cpld_bmarkfrac_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_bmarkfrac_wave_v16
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_bmarkfrac_wave_v16
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_wave_v16
 Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5856,13 +5856,13 @@ Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 905.989112
+  0: The total amount of wall time                        = 881.385353
 
 Test 101 cpld_bmarkfrac_wave_v16 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_control_wave
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_control_wave
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_wave
 Checking test 102 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5915,13 +5915,13 @@ Checking test 102 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 781.782198
+  0: The total amount of wall time                        = 779.555195
 
 Test 102 cpld_control_wave PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debug
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_debug
 Checking test 103 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5971,13 +5971,13 @@ Checking test 103 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 288.146012
+  0: The total amount of wall time                        = 285.915942
 
 Test 103 cpld_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/cpld_debugfrac
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/cpld_debugfrac
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_debugfrac
 Checking test 104 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -6027,73 +6027,73 @@ Checking test 104 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 290.711654
+  0: The total amount of wall time                        = 284.565844
 
 Test 104 cpld_debugfrac PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_control_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_control_cfsr
 Checking test 105 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 99.712761
+  0: The total amount of wall time                        = 95.410816
 
 Test 105 datm_control_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_restart_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_restart_cfsr
 Checking test 106 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 60.478684
+  0: The total amount of wall time                        = 60.909505
 
 Test 106 datm_restart_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_control_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_control_gefs
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_control_gefs
 Checking test 107 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 89.962727
+  0: The total amount of wall time                        = 88.722502
 
 Test 107 datm_control_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_bulk_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_bulk_cfsr
 Checking test 108 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 94.244593
+  0: The total amount of wall time                        = 91.873665
 
 Test 108 datm_bulk_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_bulk_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_bulk_gefs
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_bulk_gefs
 Checking test 109 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 92.172983
+  0: The total amount of wall time                        = 88.616042
 
 Test 109 datm_bulk_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_mx025_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_mx025_cfsr
 Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6102,13 +6102,13 @@ Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 366.399041
+  0: The total amount of wall time                        = 357.635167
 
 Test 110 datm_mx025_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_mx025_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_mx025_gefs
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_mx025_gefs
 Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6117,23 +6117,23 @@ Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 357.507390
+  0: The total amount of wall time                        = 345.475405
 
 Test 111 datm_mx025_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210316/INTEL/datm_debug_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_106686/datm_debug_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
+working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_debug_cfsr
 Checking test 112 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 265.079234
+  0: The total amount of wall time                        = 266.026575
 
 Test 112 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 22:25:38 UTC 2021
-Elapsed time: 01h:31m:42s. Have a nice day!
+Fri Mar 19 19:01:44 UTC 2021
+Elapsed time: 03h:05m:37s. Have a nice day!
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
index d21bbca020..85fbe99614 100644
--- a/tests/RegressionTests_jet.intel.log
+++ b/tests/RegressionTests_jet.intel.log
@@ -1,9 +1,9 @@
-Wed Mar 17 19:33:34 GMT 2021
+Fri Mar 19 20:32:46 GMT 2021
 Start Regression test
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +68,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.019073
+The total amount of wall time                        = 64.728782
 
 Test 001 fv3_control PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_2threads
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_2threads
 Checking test 002 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +139,13 @@ Checking test 002 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 291.380542
+The total amount of wall time                        = 247.935928
 
 Test 002 fv3_2threads PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_restart
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_restart
 Checking test 003 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -192,13 +192,13 @@ Checking test 003 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 27.673882
+The total amount of wall time                        = 28.060533
 
 Test 003 fv3_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_read_inc
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_read_inc
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_read_inc
 Checking test 004 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -263,13 +263,13 @@ Checking test 004 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.907264
+The total amount of wall time                        = 53.163985
 
 Test 004 fv3_read_inc PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf_esmf
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf_esmf
 Checking test 005 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -314,13 +314,13 @@ Checking test 005 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 156.743211
+The total amount of wall time                        = 188.134730
 
 Test 005 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf
 Checking test 006 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -365,13 +365,13 @@ Checking test 006 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.684815
+The total amount of wall time                        = 53.163288
 
 Test 006 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_netcdf_parallel
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf_parallel
 Checking test 007 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -416,13 +416,13 @@ Checking test 007 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 68.053817
+The total amount of wall time                        = 73.607947
 
 Test 007 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGlatlon_netcdf
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGlatlon_netcdf
 Checking test 008 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -467,13 +467,13 @@ Checking test 008 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.984470
+The total amount of wall time                        = 52.930898
 
 Test 008 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_nemsio
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_nemsio
 Checking test 009 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -518,13 +518,13 @@ Checking test 009 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.310479
+The total amount of wall time                        = 52.238510
 
 Test 009 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_wrtGauss_nemsio_c192
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_nemsio_c192
 Checking test 010 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -569,13 +569,13 @@ Checking test 010 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 140.905612
+The total amount of wall time                        = 140.933841
 
 Test 010 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stochy
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stochy
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stochy
 Checking test 011 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +640,13 @@ Checking test 011 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.977465
+The total amount of wall time                        = 60.037783
 
 Test 011 fv3_stochy PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_ca
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_ca
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_ca
 Checking test 012 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +711,13 @@ Checking test 012 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.157381
+The total amount of wall time                        = 43.965197
 
 Test 012 fv3_ca PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lndp
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_lndp
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_lndp
 Checking test 013 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +782,13 @@ Checking test 013 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 66.065248
+The total amount of wall time                        = 67.359845
 
 Test 013 fv3_lndp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_iau
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_iau
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_iau
 Checking test 014 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +853,13 @@ Checking test 014 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.581130
+The total amount of wall time                        = 52.393139
 
 Test 014 fv3_iau PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_lheatstrg
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_lheatstrg
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_lheatstrg
 Checking test 015 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -904,13 +904,13 @@ Checking test 015 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.169134
+The total amount of wall time                        = 53.119680
 
 Test 015 fv3_lheatstrg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_multigases_repro
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_multigases_repro
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_multigases_repro
 Checking test 016 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -981,13 +981,13 @@ Checking test 016 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.857413
+The total amount of wall time                        = 129.411586
 
 Test 016 fv3_multigases PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_32bit
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control_32bit
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control_32bit
 Checking test 017 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1052,13 @@ Checking test 017 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.663932
+The total amount of wall time                        = 58.787940
 
 Test 017 fv3_control_32bit PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched
 Checking test 018 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1111,13 +1111,13 @@ Checking test 018 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 393.187766
+The total amount of wall time                        = 397.670535
 
 Test 018 fv3_stretched PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched_nest
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched_nest
 Checking test 019 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1181,13 +1181,13 @@ Checking test 019 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 423.882746
+The total amount of wall time                        = 425.730764
 
 Test 019 fv3_stretched_nest PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_control
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_control
 Checking test 020 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1195,25 +1195,25 @@ Checking test 020 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 858.855780
+The total amount of wall time                        = 865.261803
 
 Test 020 fv3_regional_control PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_restart
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_restart
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_restart
 Checking test 021 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 480.755054
+The total amount of wall time                        = 480.835251
 
 Test 021 fv3_regional_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt
 Checking test 022 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1224,13 +1224,13 @@ Checking test 022 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 848.654061
+The total amount of wall time                        = 846.432121
 
 Test 022 fv3_regional_quilt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_hafs
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt_hafs
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt_hafs
 Checking test 023 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1239,27 +1239,27 @@ Checking test 023 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 850.474449
+The total amount of wall time                        = 843.338808
 
 Test 023 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_quilt_netcdf_parallel
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt_netcdf_parallel
 Checking test 024 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc .........OK
+ Comparing dynf024.nc ............ALT CHECK......OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 854.368540
+The total amount of wall time                        = 845.687904
 
 Test 024 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmp
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmp
 Checking test 025 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1304,13 +1304,13 @@ Checking test 025 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.547225
+The total amount of wall time                        = 61.442180
 
 Test 025 fv3_gfdlmp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_gwd
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_gwd
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_gwd
 Checking test 026 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1355,13 +1355,13 @@ Checking test 026 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.741896
+The total amount of wall time                        = 60.994258
 
 Test 026 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_noahmp
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_noahmp
 Checking test 027 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1406,13 +1406,13 @@ Checking test 027 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 61.105010
+The total amount of wall time                        = 61.299577
 
 Test 027 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_csawmg
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_csawmg
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_csawmg
 Checking test 028 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1457,13 +1457,13 @@ Checking test 028 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 150.699055
+The total amount of wall time                        = 151.835768
 
 Test 028 fv3_csawmg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmf
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_satmedmf
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_satmedmf
 Checking test 029 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1508,13 +1508,13 @@ Checking test 029 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.351403
+The total amount of wall time                        = 65.891762
 
 Test 029 fv3_satmedmf PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_satmedmfq
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_satmedmfq
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_satmedmfq
 Checking test 030 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1559,13 +1559,13 @@ Checking test 030 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.648666
+The total amount of wall time                        = 64.924674
 
 Test 030 fv3_satmedmfq PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmp_32bit
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmp_32bit
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmp_32bit
 Checking test 031 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1610,13 +1610,13 @@ Checking test 031 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.508828
+The total amount of wall time                        = 52.801592
 
 Test 031 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfdlmprad_32bit_post
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_32bit_post
 Checking test 032 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1665,13 +1665,13 @@ Checking test 032 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.512019
+The total amount of wall time                        = 96.194080
 
 Test 032 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_cpt
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_cpt
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_cpt
 Checking test 033 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1722,13 +1722,13 @@ Checking test 033 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 349.283110
+The total amount of wall time                        = 348.882981
 
 Test 033 fv3_cpt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd
 Checking test 034 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1817,13 +1817,13 @@ Checking test 034 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 244.449669
+The total amount of wall time                        = 240.816257
 
 Test 034 fv3_gsd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson
 Checking test 035 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1888,13 @@ Checking test 035 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.800567
+The total amount of wall time                        = 114.204287
 
 Test 035 fv3_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_no_aero
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_no_aero
 Checking test 036 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1959,13 @@ Checking test 036 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 108.742722
+The total amount of wall time                        = 109.542404
 
 Test 036 fv3_thompson_no_aero PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2
 Checking test 037 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2030,13 @@ Checking test 037 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.552870
+The total amount of wall time                        = 118.426819
 
 Test 037 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16
 Checking test 038 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2113,13 +2113,13 @@ Checking test 038 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 145.083847
+The total amount of wall time                        = 145.923377
 
 Test 038 fv3_gfs_v16 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_restart
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_restart
 Checking test 039 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2166,13 +2166,13 @@ Checking test 039 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 75.241385
+The total amount of wall time                        = 74.629030
 
 Test 039 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_stochy
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_stochy
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_stochy
 Checking test 040 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2237,85 +2237,14 @@ Checking test 040 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 66.542223
+The total amount of wall time                        = 65.585332
 
 Test 040 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_RRTMGP
-Checking test 041 fv3_gfs_v15p2_RRTMGP results ....
- Comparing atmos_4xdaily.tile1.nc .........OK
- Comparing atmos_4xdaily.tile2.nc .........OK
- Comparing atmos_4xdaily.tile3.nc .........OK
- Comparing atmos_4xdaily.tile4.nc .........OK
- Comparing atmos_4xdaily.tile5.nc .........OK
- Comparing atmos_4xdaily.tile6.nc .........OK
- Comparing phyf000.tile1.nc .........OK
- Comparing phyf000.tile2.nc .........OK
- Comparing phyf000.tile3.nc .........OK
- Comparing phyf000.tile4.nc .........OK
- Comparing phyf000.tile5.nc .........OK
- Comparing phyf000.tile6.nc .........OK
- Comparing phyf024.tile1.nc .........OK
- Comparing phyf024.tile2.nc .........OK
- Comparing phyf024.tile3.nc .........OK
- Comparing phyf024.tile4.nc .........OK
- Comparing phyf024.tile5.nc .........OK
- Comparing phyf024.tile6.nc .........OK
- Comparing dynf000.tile1.nc .........OK
- Comparing dynf000.tile2.nc .........OK
- Comparing dynf000.tile3.nc .........OK
- Comparing dynf000.tile4.nc .........OK
- Comparing dynf000.tile5.nc .........OK
- Comparing dynf000.tile6.nc .........OK
- Comparing dynf024.tile1.nc .........OK
- Comparing dynf024.tile2.nc .........OK
- Comparing dynf024.tile3.nc .........OK
- Comparing dynf024.tile4.nc .........OK
- Comparing dynf024.tile5.nc .........OK
- Comparing dynf024.tile6.nc .........OK
- Comparing RESTART/coupler.res .........OK
- Comparing RESTART/fv_core.res.nc .........OK
- Comparing RESTART/fv_core.res.tile1.nc .........OK
- Comparing RESTART/fv_core.res.tile2.nc .........OK
- Comparing RESTART/fv_core.res.tile3.nc .........OK
- Comparing RESTART/fv_core.res.tile4.nc .........OK
- Comparing RESTART/fv_core.res.tile5.nc .........OK
- Comparing RESTART/fv_core.res.tile6.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1.nc .........OK
- Comparing RESTART/fv_tracer.res.tile2.nc .........OK
- Comparing RESTART/fv_tracer.res.tile3.nc .........OK
- Comparing RESTART/fv_tracer.res.tile4.nc .........OK
- Comparing RESTART/fv_tracer.res.tile5.nc .........OK
- Comparing RESTART/fv_tracer.res.tile6.nc .........OK
- Comparing RESTART/sfc_data.tile1.nc .........OK
- Comparing RESTART/sfc_data.tile2.nc .........OK
- Comparing RESTART/sfc_data.tile3.nc .........OK
- Comparing RESTART/sfc_data.tile4.nc .........OK
- Comparing RESTART/sfc_data.tile5.nc .........OK
- Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
-
-The total amount of wall time                        = 187.628841
-
-Test 041 fv3_gfs_v15p2_RRTMGP PASS
-
-
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP
-Checking test 042 fv3_gfs_v16_RRTMGP results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP
+Checking test 041 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2379,14 +2308,14 @@ Checking test 042 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 189.007064
+The total amount of wall time                        = 202.330587
 
-Test 042 fv3_gfs_v16_RRTMGP PASS
+Test 041 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_c192L127
-Checking test 043 fv3_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 042 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2444,14 +2373,14 @@ Checking test 043 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 801.382491
+The total amount of wall time                        = 803.832167
 
-Test 043 fv3_gfs_v16_RRTMGP_c192L127 PASS
+Test 042 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_2thrd
-Checking test 044 fv3_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 043 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2515,14 +2444,14 @@ Checking test 044 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 768.356275
+The total amount of wall time                        = 827.003276
 
-Test 044 fv3_gfs_v16_RRTMGP_2thrd PASS
+Test 043 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmg
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_csawmg
-Checking test 045 fv3_gfsv16_csawmg results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_csawmg
+Checking test 044 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2566,14 +2495,14 @@ Checking test 045 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 163.570737
+The total amount of wall time                        = 162.444195
 
-Test 045 fv3_gfsv16_csawmg PASS
+Test 044 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_csawmgt
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_csawmgt
-Checking test 046 fv3_gfsv16_csawmgt results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_csawmgt
+Checking test 045 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2617,14 +2546,14 @@ Checking test 046 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 160.409704
+The total amount of wall time                        = 160.087092
 
-Test 046 fv3_gfsv16_csawmgt PASS
+Test 045 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gocart_clm
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gocart_clm
-Checking test 047 fv3_gocart_clm results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gocart_clm
+Checking test 046 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2668,14 +2597,14 @@ Checking test 047 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 67.442475
+The total amount of wall time                        = 70.082356
 
-Test 047 fv3_gocart_clm PASS
+Test 046 fv3_gocart_clm PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_flake
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_flake
-Checking test 048 fv3_gfs_v16_flake results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_flake
+Checking test 047 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2739,14 +2668,14 @@ Checking test 048 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 119.774709
+The total amount of wall time                        = 123.487427
 
-Test 048 fv3_gfs_v16_flake PASS
+Test 047 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_HAFS_v0_hwrf_thompson
-Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_HAFS_v0_hwrf_thompson
+Checking test 048 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2810,14 +2739,14 @@ Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 191.359263
+The total amount of wall time                        = 192.169109
 
-Test 049 fv3_HAFS_v0_hwrf_thompson PASS
+Test 048 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_esg_HAFS_v0_hwrf_thompson
-Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 049 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -2831,14 +2760,14 @@ Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 357.358522
+The total amount of wall time                        = 356.676973
 
-Test 050 fv3_esg_HAFS_v0_hwrf_thompson PASS
+Test 049 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1
-Checking test 051 fv3_gfsv16_ugwpv1 results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1
+Checking test 050 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2896,14 +2825,14 @@ Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 228.829873
+The total amount of wall time                        = 229.423421
 
-Test 051 fv3_gfsv16_ugwpv1 PASS
+Test 050 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1_warmstart
-Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1_warmstart
+Checking test 051 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2961,14 +2890,14 @@ Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 229.672114
+The total amount of wall time                        = 229.322248
 
-Test 052 fv3_gfsv16_ugwpv1_warmstart PASS
+Test 051 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_ras
-Checking test 053 fv3_gfs_v16_ras results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_ras
+Checking test 052 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3032,14 +2961,14 @@ Checking test 053 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.129870
+The total amount of wall time                        = 123.968164
 
-Test 053 fv3_gfs_v16_ras PASS
+Test 052 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_debug
-Checking test 054 fv3_gfs_v15p2_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2_debug
+Checking test 053 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3103,14 +3032,14 @@ Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 271.873950
+The total amount of wall time                        = 273.697286
 
-Test 054 fv3_gfs_v15p2_debug PASS
+Test 053 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_debug
-Checking test 055 fv3_gfs_v16_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_debug
+Checking test 054 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3174,14 +3103,14 @@ Checking test 055 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 207.082359
+The total amount of wall time                        = 208.127790
 
-Test 055 fv3_gfs_v16_debug PASS
+Test 054 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v15p2_RRTMGP_debug
-Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 055 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3245,14 +3174,14 @@ Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 438.413542
+The total amount of wall time                        = 440.089160
 
-Test 056 fv3_gfs_v15p2_RRTMGP_debug PASS
+Test 055 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_RRTMGP_debug
-Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_debug
+Checking test 056 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3316,28 +3245,28 @@ Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 447.659668
+The total amount of wall time                        = 451.065134
 
-Test 057 fv3_gfs_v16_RRTMGP_debug PASS
+Test 056 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_regional_control_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_regional_control_debug
-Checking test 058 fv3_regional_control_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_control_debug
+Checking test 057 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 458.928966
+The total amount of wall time                        = 458.313491
 
-Test 058 fv3_regional_control_debug PASS
+Test 057 fv3_regional_control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_control_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_control_debug
-Checking test 059 fv3_control_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control_debug
+Checking test 058 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3363,14 +3292,14 @@ Checking test 059 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 157.690354
+The total amount of wall time                        = 158.968260
 
-Test 059 fv3_control_debug PASS
+Test 058 fv3_control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_stretched_nest_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_stretched_nest_debug
-Checking test 060 fv3_stretched_nest_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched_nest_debug
+Checking test 059 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3386,14 +3315,14 @@ Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 534.941205
+The total amount of wall time                        = 535.750789
 
-Test 060 fv3_stretched_nest_debug PASS
+Test 059 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd_debug
-Checking test 061 fv3_gsd_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd_debug
+Checking test 060 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3457,14 +3386,14 @@ Checking test 061 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 238.318598
+The total amount of wall time                        = 239.269686
 
-Test 061 fv3_gsd_debug PASS
+Test 060 fv3_gsd_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gsd_diag3d_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gsd_diag3d_debug
-Checking test 062 fv3_gsd_diag3d_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd_diag3d_debug
+Checking test 061 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3528,14 +3457,14 @@ Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 270.684010
+The total amount of wall time                        = 271.115849
 
-Test 062 fv3_gsd_diag3d_debug PASS
+Test 061 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_debug
-Checking test 063 fv3_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_debug
+Checking test 062 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3599,14 +3528,14 @@ Checking test 063 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 417.304640
+The total amount of wall time                        = 417.427067
 
-Test 063 fv3_thompson_debug PASS
+Test 062 fv3_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_thompson_no_aero_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_thompson_no_aero_debug
-Checking test 064 fv3_thompson_no_aero_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_no_aero_debug
+Checking test 063 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3670,14 +3599,14 @@ Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 402.109266
+The total amount of wall time                        = 401.368140
 
-Test 064 fv3_thompson_no_aero_debug PASS
+Test 063 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_rrfs_v1beta_debug
-Checking test 065 fv3_rrfs_v1beta_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_rrfs_v1beta_debug
+Checking test 064 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3741,14 +3670,14 @@ Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 232.941492
+The total amount of wall time                        = 231.962234
 
-Test 065 fv3_rrfs_v1beta_debug PASS
+Test 064 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_HAFS_v0_hwrf_thompson_debug
-Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 065 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3812,14 +3741,14 @@ Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 247.699269
+The total amount of wall time                        = 247.594030
 
-Test 066 fv3_HAFS_v0_hwrf_thompson_debug PASS
+Test 065 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_esg_HAFS_v0_hwrf_thompson_debug
-Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 066 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -3833,14 +3762,14 @@ Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 462.514551
+The total amount of wall time                        = 464.549115
 
-Test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 066 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfsv16_ugwpv1_debug
-Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1_debug
+Checking test 067 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3898,14 +3827,14 @@ Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 708.519770
+The total amount of wall time                        = 709.309574
 
-Test 068 fv3_gfsv16_ugwpv1_debug PASS
+Test 067 fv3_gfsv16_ugwpv1_debug PASS
 
 
-baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210316/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dom.Heinzeller/RT_RUNDIRS/Dom.Heinzeller/FV3_RT/rt_175899/fv3_gfs_v16_ras_debug
-Checking test 069 fv3_gfs_v16_ras_debug results ....
+baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_ras_debug
+Checking test 068 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3969,11 +3898,11 @@ Checking test 069 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 395.906445
+The total amount of wall time                        = 395.013982
 
-Test 069 fv3_gfs_v16_ras_debug PASS
+Test 068 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Mar 17 21:50:12 GMT 2021
-Elapsed time: 02h:16m:39s. Have a nice day!
+Fri Mar 19 23:14:51 GMT 2021
+Elapsed time: 02h:42m:05s. Have a nice day!
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
index 301964dfb3..bd8bb38e30 100644
--- a/tests/RegressionTests_orion.intel.log
+++ b/tests/RegressionTests_orion.intel.log
@@ -1,10 +1,10 @@
-Fri Mar 12 21:17:03 CST 2021
+Fri Mar 19 12:50:33 CDT 2021
 Start Regression test
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +68,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.335967
+  0: The total amount of wall time                        = 49.822248
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_decomp_prod
-Checking test 002 fv3_ccpp_decomp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_decomp
+Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +139,14 @@ Checking test 002 fv3_ccpp_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.909151
+  0: The total amount of wall time                        = 51.521173
 
-Test 002 fv3_ccpp_decomp PASS
+Test 002 fv3_decomp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_2threads_prod
-Checking test 003 fv3_ccpp_2threads results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_2threads
+Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -210,14 +210,14 @@ Checking test 003 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 53.512654
+ 0: The total amount of wall time                        = 45.713742
 
-Test 003 fv3_ccpp_2threads PASS
+Test 003 fv3_2threads PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_restart_prod
-Checking test 004 fv3_ccpp_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_restart
+Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -263,14 +263,14 @@ Checking test 004 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 24.881297
+  0: The total amount of wall time                        = 28.132500
 
-Test 004 fv3_ccpp_restart PASS
+Test 004 fv3_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_read_inc_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_read_inc_prod
-Checking test 005 fv3_ccpp_read_inc results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_read_inc
+Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -334,14 +334,14 @@ Checking test 005 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.960439
+  0: The total amount of wall time                        = 44.505180
 
-Test 005 fv3_ccpp_read_inc PASS
+Test 005 fv3_read_inc PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf_esmf
+Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -385,14 +385,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 152.822694
+  0: The total amount of wall time                        = 166.407823
 
-Test 006 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf
+Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -436,14 +436,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.459556
+  0: The total amount of wall time                        = 40.838167
 
-Test 007 fv3_ccpp_wrtGauss_netcdf PASS
+Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf_parallel
+Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -453,7 +453,7 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc .........OK
+ Comparing dynf024.nc ............ALT CHECK......OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -487,14 +487,14 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.314491
+  0: The total amount of wall time                        = 62.405697
 
-Test 008 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGlatlon_netcdf
+Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -538,14 +538,14 @@ Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.327716
+  0: The total amount of wall time                        = 47.179670
 
-Test 009 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio
+Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -589,14 +589,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.746261
+  0: The total amount of wall time                        = 45.659848
 
-Test 010 fv3_ccpp_wrtGauss_nemsio PASS
+Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio_c192
+Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +640,14 @@ Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 102.974613
+  0: The total amount of wall time                        = 109.415050
 
-Test 011 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stochy_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_stochy_prod
-Checking test 012 fv3_ccpp_stochy results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stochy
+Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +711,14 @@ Checking test 012 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.343612
+  0: The total amount of wall time                        = 44.225112
 
-Test 012 fv3_ccpp_stochy PASS
+Test 012 fv3_stochy PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ca_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_ca_prod
-Checking test 013 fv3_ccpp_ca results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_ca
+Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +782,14 @@ Checking test 013 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 30.400909
+  0: The total amount of wall time                        = 30.103813
 
-Test 013 fv3_ccpp_ca PASS
+Test 013 fv3_ca PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lndp_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_lndp_prod
-Checking test 014 fv3_ccpp_lndp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_lndp
+Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +853,14 @@ Checking test 014 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 48.801022
+  0: The total amount of wall time                        = 56.130941
 
-Test 014 fv3_ccpp_lndp PASS
+Test 014 fv3_lndp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_iau_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_iau_prod
-Checking test 015 fv3_ccpp_iau results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_iau
+Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -924,14 +924,14 @@ Checking test 015 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 44.134449
+  0: The total amount of wall time                        = 50.465295
 
-Test 015 fv3_ccpp_iau PASS
+Test 015 fv3_iau PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_lheatstrg_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_lheatstrg_prod
-Checking test 016 fv3_ccpp_lheatstrg results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_lheatstrg
+Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -975,14 +975,14 @@ Checking test 016 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.349731
+  0: The total amount of wall time                        = 46.489782
 
-Test 016 fv3_ccpp_lheatstrg PASS
+Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmprad_prod
-Checking test 017 fv3_ccpp_gfdlmprad results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad
+Checking test 017 fv3_gfdlmprad results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1027,14 +1027,14 @@ Checking test 017 fv3_ccpp_gfdlmprad results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 654.665384
+  0: The total amount of wall time                        = 678.419956
 
-Test 017 fv3_ccpp_gfdlmprad PASS
+Test 017 fv3_gfdlmprad PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_atmwav_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmprad_atmwav_prod
-Checking test 018 fv3_ccpp_gfdlmprad_atmwav results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_atmwav
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_atmwav
+Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1079,14 +1079,14 @@ Checking test 018 fv3_ccpp_gfdlmprad_atmwav results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 798.266029
+  0: The total amount of wall time                        = 826.633003
 
-Test 018 fv3_ccpp_gfdlmprad_atmwav PASS
+Test 018 fv3_gfdlmprad_atmwav PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_wrtGauss_nemsio_c768_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_wrtGauss_nemsio_c768_prod
-Checking test 019 fv3_ccpp_wrtGauss_nemsio_c768 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c768
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio_c768
+Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1131,14 +1131,14 @@ Checking test 019 fv3_ccpp_wrtGauss_nemsio_c768 results ....
  Comparing out_grd.ant_9km .........OK
  Comparing out_grd.aoc_9km .........OK
 
-   0: The total amount of wall time                        = 673.063059
+   0: The total amount of wall time                        = 706.467872
 
-Test 019 fv3_ccpp_wrtGauss_nemsio_c768 PASS
+Test 019 fv3_wrtGauss_nemsio_c768 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_multigases_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_multigases_prod
-Checking test 020 fv3_ccpp_multigases results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_multigases_repro
+Checking test 020 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1208,14 +1208,14 @@ Checking test 020 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 85.409100
+  0: The total amount of wall time                        = 107.230897
 
-Test 020 fv3_ccpp_multigases PASS
+Test 020 fv3_multigases PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_32bit_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_control_32bit_prod
-Checking test 021 fv3_ccpp_control_32bit results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control_32bit
+Checking test 021 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1279,14 +1279,14 @@ Checking test 021 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.169483
+  0: The total amount of wall time                        = 47.582102
 
-Test 021 fv3_ccpp_control_32bit PASS
+Test 021 fv3_control_32bit PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_stretched_prod
-Checking test 022 fv3_ccpp_stretched results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched
+Checking test 022 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1338,14 +1338,14 @@ Checking test 022 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 217.704896
+ 0: The total amount of wall time                        = 217.262541
 
-Test 022 fv3_ccpp_stretched PASS
+Test 022 fv3_stretched PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_stretched_nest_prod
-Checking test 023 fv3_ccpp_stretched_nest results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched_nest
+Checking test 023 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1408,40 +1408,40 @@ Checking test 023 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
- 0: The total amount of wall time                        = 240.960080
+ 0: The total amount of wall time                        = 243.162287
 
-Test 023 fv3_ccpp_stretched_nest PASS
+Test 023 fv3_stretched_nest PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_control_prod
-Checking test 024 fv3_ccpp_regional_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_control
+Checking test 024 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 535.673257
+ 0: The total amount of wall time                        = 536.273022
 
-Test 024 fv3_ccpp_regional_control PASS
+Test 024 fv3_regional_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_restart_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_restart_prod
-Checking test 025 fv3_ccpp_regional_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_restart
+Checking test 025 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
- 0: The total amount of wall time                        = 298.239390
+ 0: The total amount of wall time                        = 301.035378
 
-Test 025 fv3_ccpp_regional_restart PASS
+Test 025 fv3_regional_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_quilt_prod
-Checking test 026 fv3_ccpp_regional_quilt results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt
+Checking test 026 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1451,14 +1451,14 @@ Checking test 026 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 591.477761
+ 0: The total amount of wall time                        = 576.311724
 
-Test 026 fv3_ccpp_regional_quilt PASS
+Test 026 fv3_regional_quilt PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_hafs_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 027 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt_hafs
+Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1466,28 +1466,28 @@ Checking test 027 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 580.465772
+ 0: The total amount of wall time                        = 580.253857
 
-Test 027 fv3_ccpp_regional_quilt_hafs PASS
+Test 027 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 028 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt_netcdf_parallel
+Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc ............ALT CHECK......OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 584.521443
+ 0: The total amount of wall time                        = 577.972230
 
-Test 028 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 028 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmp_prod
-Checking test 029 fv3_ccpp_gfdlmp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmp
+Checking test 029 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1531,14 +1531,14 @@ Checking test 029 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.435399
+  0: The total amount of wall time                        = 49.088020
 
-Test 029 fv3_ccpp_gfdlmp PASS
+Test 029 fv3_gfdlmp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_gwd_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 030 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_gwd
+Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1582,14 +1582,14 @@ Checking test 030 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 48.252765
+  0: The total amount of wall time                        = 49.180437
 
-Test 030 fv3_ccpp_gfdlmprad_gwd PASS
+Test 030 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 031 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_noahmp
+Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1633,14 +1633,14 @@ Checking test 031 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 56.766459
+  0: The total amount of wall time                        = 52.319969
 
-Test 031 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 031 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_csawmg_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_csawmg_prod
-Checking test 032 fv3_ccpp_csawmg results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_csawmg
+Checking test 032 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1684,14 +1684,14 @@ Checking test 032 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 115.579388
+  0: The total amount of wall time                        = 109.398812
 
-Test 032 fv3_ccpp_csawmg PASS
+Test 032 fv3_csawmg PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmf_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_satmedmf_prod
-Checking test 033 fv3_ccpp_satmedmf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_satmedmf
+Checking test 033 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1735,14 +1735,14 @@ Checking test 033 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.209134
+  0: The total amount of wall time                        = 53.796980
 
-Test 033 fv3_ccpp_satmedmf PASS
+Test 033 fv3_satmedmf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_satmedmfq_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_satmedmfq_prod
-Checking test 034 fv3_ccpp_satmedmfq results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_satmedmfq
+Checking test 034 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1786,14 +1786,14 @@ Checking test 034 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.012331
+  0: The total amount of wall time                        = 49.514721
 
-Test 034 fv3_ccpp_satmedmfq PASS
+Test 034 fv3_satmedmfq PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmp_32bit_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 035 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmp_32bit
+Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1837,14 +1837,14 @@ Checking test 035 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.385652
+  0: The total amount of wall time                        = 49.923095
 
-Test 035 fv3_ccpp_gfdlmp_32bit PASS
+Test 035 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 036 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_32bit_post
+Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1892,14 +1892,14 @@ Checking test 036 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 77.148335
+  0: The total amount of wall time                        = 72.847140
 
-Test 036 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 036 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_cpt_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_cpt_prod
-Checking test 037 fv3_ccpp_cpt results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_cpt
+Checking test 037 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1949,14 +1949,14 @@ Checking test 037 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 266.666866
+  0: The total amount of wall time                        = 258.808684
 
-Test 037 fv3_ccpp_cpt PASS
+Test 037 fv3_cpt PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gsd_prod
-Checking test 038 fv3_ccpp_gsd results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd
+Checking test 038 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2044,14 +2044,14 @@ Checking test 038 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 187.188712
+  0: The total amount of wall time                        = 181.978842
 
-Test 038 fv3_ccpp_gsd PASS
+Test 038 fv3_gsd PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rap_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_rap_prod
-Checking test 039 fv3_ccpp_rap results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rap
+Checking test 039 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2115,14 +2115,14 @@ Checking test 039 fv3_ccpp_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 96.997649
+  0: The total amount of wall time                        = 99.758309
 
-Test 039 fv3_ccpp_rap PASS
+Test 039 fv3_rap PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_hrrr_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_hrrr_prod
-Checking test 040 fv3_ccpp_hrrr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_hrrr
+Checking test 040 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2186,14 +2186,14 @@ Checking test 040 fv3_ccpp_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 104.337900
+  0: The total amount of wall time                        = 108.362225
 
-Test 040 fv3_ccpp_hrrr PASS
+Test 040 fv3_hrrr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_thompson_prod
-Checking test 041 fv3_ccpp_thompson results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson
+Checking test 041 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2257,14 +2257,14 @@ Checking test 041 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 95.628960
+  0: The total amount of wall time                        = 96.981672
 
-Test 041 fv3_ccpp_thompson PASS
+Test 041 fv3_thompson PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_thompson_no_aero_prod
-Checking test 042 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_no_aero
+Checking test 042 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2328,14 +2328,14 @@ Checking test 042 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 89.094245
+  0: The total amount of wall time                        = 89.632598
 
-Test 042 fv3_ccpp_thompson_no_aero PASS
+Test 042 fv3_thompson_no_aero PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_rrfs_v1beta_prod
-Checking test 043 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rrfs_v1beta
+Checking test 043 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2399,14 +2399,14 @@ Checking test 043 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 105.609223
+  0: The total amount of wall time                        = 111.207011
 
-Test 043 fv3_ccpp_rrfs_v1beta PASS
+Test 043 fv3_rrfs_v1beta PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v15p2_prod
-Checking test 044 fv3_ccpp_gfs_v15p2 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2
+Checking test 044 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2470,14 +2470,14 @@ Checking test 044 fv3_ccpp_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 99.985320
+  0: The total amount of wall time                        = 100.258678
 
-Test 044 fv3_ccpp_gfs_v15p2 PASS
+Test 044 fv3_gfs_v15p2 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_prod
-Checking test 045 fv3_ccpp_gfs_v16 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16
+Checking test 045 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2553,14 +2553,14 @@ Checking test 045 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 113.638839
+  0: The total amount of wall time                        = 117.674490
 
-Test 045 fv3_ccpp_gfs_v16 PASS
+Test 045 fv3_gfs_v16 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_restart_prod
-Checking test 046 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_restart
+Checking test 046 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2606,14 +2606,14 @@ Checking test 046 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 62.982109
+  0: The total amount of wall time                        = 61.382059
 
-Test 046 fv3_ccpp_gfs_v16_restart PASS
+Test 046 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_stochy_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 047 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_stochy
+Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2677,14 +2677,14 @@ Checking test 047 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.746916
+  0: The total amount of wall time                        = 56.009358
 
-Test 047 fv3_ccpp_gfs_v16_stochy PASS
+Test 047 fv3_gfs_v16_stochy PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 048 fv3_ccpp_gfs_v15p2_RRTMGP results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_RRTMGP
+Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2748,14 +2748,14 @@ Checking test 048 fv3_ccpp_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 162.150450
+  0: The total amount of wall time                        = 165.693850
 
-Test 048 fv3_ccpp_gfs_v15p2_RRTMGP PASS
+Test 048 fv3_gfs_v15p2_RRTMGP PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 049 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP
+Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2819,14 +2819,14 @@ Checking test 049 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 163.253696
+  0: The total amount of wall time                        = 172.052786
 
-Test 049 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 049 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2884,14 +2884,14 @@ Checking test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 626.222349
+  0: The total amount of wall time                        = 629.327169
 
-Test 050 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 050 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2955,14 +2955,14 @@ Checking test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 190.698181
+ 0: The total amount of wall time                        = 177.248846
 
-Test 051 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 051 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmg_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfsv16_csawmg_prod
-Checking test 052 fv3_ccpp_gfsv16_csawmg results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_csawmg
+Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3006,14 +3006,14 @@ Checking test 052 fv3_ccpp_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 126.215471
+  0: The total amount of wall time                        = 128.621910
 
-Test 052 fv3_ccpp_gfsv16_csawmg PASS
+Test 052 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfsv16_csawmgt_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfsv16_csawmgt_prod
-Checking test 053 fv3_ccpp_gfsv16_csawmgt results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_csawmgt
+Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3057,14 +3057,14 @@ Checking test 053 fv3_ccpp_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 124.487777
+  0: The total amount of wall time                        = 126.372323
 
-Test 053 fv3_ccpp_gfsv16_csawmgt PASS
+Test 053 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gocart_clm_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gocart_clm_prod
-Checking test 054 fv3_ccpp_gocart_clm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gocart_clm
+Checking test 054 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3108,14 +3108,14 @@ Checking test 054 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 59.289760
+  0: The total amount of wall time                        = 61.167507
 
-Test 054 fv3_ccpp_gocart_clm PASS
+Test 054 fv3_gocart_clm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_flake_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_flake_prod
-Checking test 055 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_flake
+Checking test 055 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3179,14 +3179,14 @@ Checking test 055 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 104.836787
+  0: The total amount of wall time                        = 113.282933
 
-Test 055 fv3_ccpp_gfs_v16_flake PASS
+Test 055 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 056 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_HAFS_v0_hwrf_thompson
+Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3250,14 +3250,14 @@ Checking test 056 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 147.882367
+  0: The total amount of wall time                        = 151.985419
 
-Test 056 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 056 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -3271,14 +3271,14 @@ Checking test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 289.858017
+ 0: The total amount of wall time                        = 292.902368
 
-Test 057 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 057 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 058 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1
+Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3336,14 +3336,14 @@ Checking test 058 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 170.089998
+  0: The total amount of wall time                        = 181.379209
 
-Test 058 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 058 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1_warmstart
+Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3401,14 +3401,85 @@ Checking test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 172.388475
+  0: The total amount of wall time                        = 177.143703
+
+Test 059 fv3_gfsv16_ugwpv1_warmstart PASS
+
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_ras
+Checking test 060 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 103.104727
 
-Test 059 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 060 fv3_gfs_v16_ras PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 060 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_debug
+Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3472,14 +3543,14 @@ Checking test 060 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 251.703488
+  0: The total amount of wall time                        = 242.582630
 
-Test 060 fv3_ccpp_gfs_v15p2_debug PASS
+Test 061 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_debug_prod
-Checking test 061 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_debug
+Checking test 062 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3543,14 +3614,14 @@ Checking test 061 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 189.430133
+  0: The total amount of wall time                        = 185.523880
 
-Test 061 fv3_ccpp_gfs_v16_debug PASS
+Test 062 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3614,14 +3685,14 @@ Checking test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 373.969692
+  0: The total amount of wall time                        = 371.331039
 
-Test 062 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 063 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 063 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_debug
+Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3685,28 +3756,28 @@ Checking test 063 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 382.031132
+  0: The total amount of wall time                        = 384.243546
 
-Test 063 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 064 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_regional_control_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_regional_control_debug_prod
-Checking test 064 fv3_ccpp_regional_control_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_control_debug
+Checking test 065 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 367.720884
+ 0: The total amount of wall time                        = 368.364244
 
-Test 064 fv3_ccpp_regional_control_debug PASS
+Test 065 fv3_regional_control_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_control_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_control_debug_prod
-Checking test 065 fv3_ccpp_control_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control_debug
+Checking test 066 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3732,14 +3803,14 @@ Checking test 065 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 149.916615
+  0: The total amount of wall time                        = 155.221480
 
-Test 065 fv3_ccpp_control_debug PASS
+Test 066 fv3_control_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_stretched_nest_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_stretched_nest_debug_prod
-Checking test 066 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched_nest_debug
+Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3755,14 +3826,14 @@ Checking test 066 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 371.255363
+ 0: The total amount of wall time                        = 375.623118
 
-Test 066 fv3_ccpp_stretched_nest_debug PASS
+Test 067 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gsd_debug_prod
-Checking test 067 fv3_ccpp_gsd_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd_debug
+Checking test 068 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3826,14 +3897,14 @@ Checking test 067 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 221.754395
+  0: The total amount of wall time                        = 215.241294
 
-Test 067 fv3_ccpp_gsd_debug PASS
+Test 068 fv3_gsd_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_gsd_diag3d_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 068 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd_diag3d_debug
+Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3897,14 +3968,14 @@ Checking test 068 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 296.344801
+  0: The total amount of wall time                        = 295.256237
 
-Test 068 fv3_ccpp_gsd_diag3d_debug PASS
+Test 069 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_thompson_debug_prod
-Checking test 069 fv3_ccpp_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_debug
+Checking test 070 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3968,14 +4039,14 @@ Checking test 069 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 349.154207
+  0: The total amount of wall time                        = 353.634309
 
-Test 069 fv3_ccpp_thompson_debug PASS
+Test 070 fv3_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_thompson_no_aero_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 070 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_no_aero_debug
+Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4039,14 +4110,14 @@ Checking test 070 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 369.681577
+  0: The total amount of wall time                        = 333.756109
 
-Test 070 fv3_ccpp_thompson_no_aero_debug PASS
+Test 071 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 071 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rrfs_v1beta_debug
+Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4110,14 +4181,14 @@ Checking test 071 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 207.134888
+  0: The total amount of wall time                        = 209.763849
 
-Test 071 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 072 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4181,14 +4252,14 @@ Checking test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 216.447621
+  0: The total amount of wall time                        = 263.676892
 
-Test 072 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 073 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -4202,14 +4273,14 @@ Checking test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 417.919395
+ 0: The total amount of wall time                        = 410.622427
 
-Test 073 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 074 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1_debug
+Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -4267,14 +4338,85 @@ Checking test 074 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 567.689142
+  0: The total amount of wall time                        = 577.490209
+
+Test 075 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_ras_debug
+Checking test 076 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 338.669822
 
-Test 074 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 076 fv3_gfs_v16_ras_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_control_prod
-Checking test 075 cpld_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control
+Checking test 077 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4323,14 +4465,14 @@ Checking test 075 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 99.768565
+  0: The total amount of wall time                        = 119.325516
 
-Test 075 cpld_control PASS
+Test 077 cpld_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_prod
-Checking test 076 cpld_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart
+Checking test 078 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4379,14 +4521,14 @@ Checking test 076 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 75.123364
+  0: The total amount of wall time                        = 68.154787
 
-Test 076 cpld_restart PASS
+Test 078 cpld_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_controlfrac_prod
-Checking test 077 cpld_controlfrac results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac
+Checking test 079 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4435,14 +4577,14 @@ Checking test 077 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 101.608224
+  0: The total amount of wall time                        = 117.598597
 
-Test 077 cpld_controlfrac PASS
+Test 079 cpld_controlfrac PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restartfrac_prod
-Checking test 078 cpld_restartfrac results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac
+Checking test 080 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4491,14 +4633,14 @@ Checking test 078 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 68.391162
+  0: The total amount of wall time                        = 78.913061
 
-Test 078 cpld_restartfrac PASS
+Test 080 cpld_restartfrac PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_2threads_prod
-Checking test 079 cpld_2threads results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_2threads
+Checking test 081 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4547,14 +4689,14 @@ Checking test 079 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 133.696323
+  0: The total amount of wall time                        = 133.379763
 
-Test 079 cpld_2threads PASS
+Test 081 cpld_2threads PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_decomp_prod
-Checking test 080 cpld_decomp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_decomp
+Checking test 082 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4603,14 +4745,14 @@ Checking test 080 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 96.867347
+  0: The total amount of wall time                        = 104.163066
 
-Test 080 cpld_decomp PASS
+Test 082 cpld_decomp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_satmedmf_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_satmedmf_prod
-Checking test 081 cpld_satmedmf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_satmedmf
+Checking test 083 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4659,14 +4801,14 @@ Checking test 081 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 96.332041
+  0: The total amount of wall time                        = 108.150363
 
-Test 081 cpld_satmedmf PASS
+Test 083 cpld_satmedmf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_ca_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_ca_prod
-Checking test 082 cpld_ca results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_ca
+Checking test 084 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4715,14 +4857,14 @@ Checking test 082 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 97.729955
+  0: The total amount of wall time                        = 111.862948
 
-Test 082 cpld_ca PASS
+Test 084 cpld_ca PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_control_c192_prod
-Checking test 083 cpld_control_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_c192
+Checking test 085 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4771,14 +4913,14 @@ Checking test 083 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 383.916568
+  0: The total amount of wall time                        = 397.017496
 
-Test 083 cpld_control_c192 PASS
+Test 085 cpld_control_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c192_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_c192_prod
-Checking test 084 cpld_restart_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_c192
+Checking test 086 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4827,14 +4969,14 @@ Checking test 084 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 275.426220
+  0: The total amount of wall time                        = 272.736278
 
-Test 084 cpld_restart_c192 PASS
+Test 086 cpld_restart_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_controlfrac_c192_prod
-Checking test 085 cpld_controlfrac_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac_c192
+Checking test 087 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4883,14 +5025,14 @@ Checking test 085 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 381.668018
+  0: The total amount of wall time                        = 400.553613
 
-Test 085 cpld_controlfrac_c192 PASS
+Test 087 cpld_controlfrac_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c192_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restartfrac_c192_prod
-Checking test 086 cpld_restartfrac_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac_c192
+Checking test 088 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -4939,14 +5081,14 @@ Checking test 086 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 271.383950
+  0: The total amount of wall time                        = 278.647891
 
-Test 086 cpld_restartfrac_c192 PASS
+Test 088 cpld_restartfrac_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_control_c384_prod
-Checking test 087 cpld_control_c384 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_c384
+Checking test 089 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -4998,14 +5140,14 @@ Checking test 087 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1306.790624
+  0: The total amount of wall time                        = 1336.147422
 
-Test 087 cpld_control_c384 PASS
+Test 089 cpld_control_c384 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_c384_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_c384_prod
-Checking test 088 cpld_restart_c384 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_c384
+Checking test 090 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5057,14 +5199,14 @@ Checking test 088 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 695.602527
+  0: The total amount of wall time                        = 713.934599
 
-Test 088 cpld_restart_c384 PASS
+Test 090 cpld_restart_c384 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_controlfrac_c384_prod
-Checking test 089 cpld_controlfrac_c384 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac_c384
+Checking test 091 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5116,14 +5258,14 @@ Checking test 089 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1312.468145
+  0: The total amount of wall time                        = 1406.099769
 
-Test 089 cpld_controlfrac_c384 PASS
+Test 091 cpld_controlfrac_c384 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_controlfrac_c384_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restartfrac_c384_prod
-Checking test 090 cpld_restartfrac_c384 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac_c384
+Checking test 092 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5175,14 +5317,14 @@ Checking test 090 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 685.239220
+  0: The total amount of wall time                        = 706.690926
 
-Test 090 cpld_restartfrac_c384 PASS
+Test 092 cpld_restartfrac_c384 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmark_prod
-Checking test 091 cpld_bmark results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmark
+Checking test 093 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5234,14 +5376,14 @@ Checking test 091 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 842.253747
+  0: The total amount of wall time                        = 824.173979
 
-Test 091 cpld_bmark PASS
+Test 093 cpld_bmark PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_bmark_prod
-Checking test 092 cpld_restart_bmark results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmark
+Checking test 094 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5293,14 +5435,14 @@ Checking test 092 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 452.600613
+  0: The total amount of wall time                        = 457.215343
 
-Test 092 cpld_restart_bmark PASS
+Test 094 cpld_restart_bmark PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmarkfrac_prod
-Checking test 093 cpld_bmarkfrac results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac
+Checking test 095 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5352,14 +5494,14 @@ Checking test 093 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 831.423830
+  0: The total amount of wall time                        = 829.110986
 
-Test 093 cpld_bmarkfrac PASS
+Test 095 cpld_bmarkfrac PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_bmarkfrac_prod
-Checking test 094 cpld_restart_bmarkfrac results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmarkfrac
+Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5411,14 +5553,14 @@ Checking test 094 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 442.128834
+  0: The total amount of wall time                        = 453.932339
 
-Test 094 cpld_restart_bmarkfrac PASS
+Test 096 cpld_restart_bmarkfrac PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmarkfrac_v16_prod
-Checking test 095 cpld_bmarkfrac_v16 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_v16
+Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5470,14 +5612,14 @@ Checking test 095 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 1349.080037
+  0: The total amount of wall time                        = 1344.124539
 
-Test 095 cpld_bmarkfrac_v16 PASS
+Test 097 cpld_bmarkfrac_v16 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_v16_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_restart_bmarkfrac_v16_prod
-Checking test 096 cpld_restart_bmarkfrac_v16 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmarkfrac_v16
+Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
  Comparing phyf012.tile3.nc .........OK
@@ -5529,14 +5671,14 @@ Checking test 096 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 716.142617
+  0: The total amount of wall time                        = 740.990276
 
-Test 096 cpld_restart_bmarkfrac_v16 PASS
+Test 098 cpld_restart_bmarkfrac_v16 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmark_wave_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmark_wave_prod
-Checking test 097 cpld_bmark_wave results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmark_wave
+Checking test 099 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5591,14 +5733,14 @@ Checking test 097 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1402.828957
+  0: The total amount of wall time                        = 1432.098204
 
-Test 097 cpld_bmark_wave PASS
+Test 099 cpld_bmark_wave PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmarkfrac_wave_prod
-Checking test 098 cpld_bmarkfrac_wave results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_wave
+Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5653,14 +5795,14 @@ Checking test 098 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1416.011810
+  0: The total amount of wall time                        = 1429.371386
 
-Test 098 cpld_bmarkfrac_wave PASS
+Test 100 cpld_bmarkfrac_wave PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_bmarkfrac_wave_v16_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_bmarkfrac_wave_v16_prod
-Checking test 099 cpld_bmarkfrac_wave_v16 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_wave_v16
+Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5714,14 +5856,14 @@ Checking test 099 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 939.150736
+  0: The total amount of wall time                        = 951.222093
 
-Test 099 cpld_bmarkfrac_wave_v16 PASS
+Test 101 cpld_bmarkfrac_wave_v16 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_control_wave_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_control_wave_prod
-Checking test 100 cpld_control_wave results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_wave
+Checking test 102 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -5773,14 +5915,14 @@ Checking test 100 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 790.442777
+  0: The total amount of wall time                        = 815.263136
 
-Test 100 cpld_control_wave PASS
+Test 102 cpld_control_wave PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debug_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_debug_prod
-Checking test 101 cpld_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_debug
+Checking test 103 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5829,14 +5971,14 @@ Checking test 101 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 321.112205
+  0: The total amount of wall time                        = 341.676165
 
-Test 101 cpld_debug PASS
+Test 103 cpld_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/cpld_debugfrac_ccpp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/cpld_debugfrac_prod
-Checking test 102 cpld_debugfrac results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_debugfrac
+Checking test 104 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
  Comparing phyf006.tile3.nc .........OK
@@ -5885,74 +6027,74 @@ Checking test 102 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 322.169993
+  0: The total amount of wall time                        = 327.395689
 
-Test 102 cpld_debugfrac PASS
+Test 104 cpld_debugfrac PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_control_cfsr
-Checking test 103 datm_control_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_control_cfsr
+Checking test 105 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 99.728356
+  0: The total amount of wall time                        = 104.235935
 
-Test 103 datm_control_cfsr PASS
+Test 105 datm_control_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_restart_cfsr
-Checking test 104 datm_restart_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_restart_cfsr
+Checking test 106 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 68.416477
+  0: The total amount of wall time                        = 71.592949
 
-Test 104 datm_restart_cfsr PASS
+Test 106 datm_restart_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_control_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_control_gefs
-Checking test 105 datm_control_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_control_gefs
+Checking test 107 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 94.162639
+  0: The total amount of wall time                        = 97.500170
 
-Test 105 datm_control_gefs PASS
+Test 107 datm_control_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_bulk_cfsr
-Checking test 106 datm_bulk_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_bulk_cfsr
+Checking test 108 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 99.111430
+  0: The total amount of wall time                        = 105.271493
 
-Test 106 datm_bulk_cfsr PASS
+Test 108 datm_bulk_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_bulk_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_bulk_gefs
-Checking test 107 datm_bulk_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_bulk_gefs
+Checking test 109 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 92.246859
+  0: The total amount of wall time                        = 92.326933
 
-Test 107 datm_bulk_gefs PASS
+Test 109 datm_bulk_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_mx025_cfsr
-Checking test 108 datm_mx025_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_mx025_cfsr
+Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5960,14 +6102,14 @@ Checking test 108 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 391.029178
+  0: The total amount of wall time                        = 387.359123
 
-Test 108 datm_mx025_cfsr PASS
+Test 110 datm_mx025_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_mx025_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_mx025_gefs
-Checking test 109 datm_mx025_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_mx025_gefs
+Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -5975,23 +6117,23 @@ Checking test 109 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 388.183296
+  0: The total amount of wall time                        = 409.867554
 
-Test 109 datm_mx025_gefs PASS
+Test 111 datm_mx025_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/INTEL/datm_debug_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_255891/datm_debug_cfsr
-Checking test 110 datm_debug_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
+working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_debug_cfsr
+Checking test 112 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 281.109002
+  0: The total amount of wall time                        = 290.904811
 
-Test 110 datm_debug_cfsr PASS
+Test 112 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Mar 12 23:59:51 CST 2021
-Elapsed time: 02h:42m:49s. Have a nice day!
+Fri Mar 19 14:13:34 CDT 2021
+Elapsed time: 01h:23m:02s. Have a nice day!
diff --git a/tests/ci/ci.test b/tests/ci/ci.test
index c1ebb3278b..bf8c8abd07 100644
--- a/tests/ci/ci.test
+++ b/tests/ci/ci.test
@@ -1,3 +1,3 @@
-fv3_ccpp_control
+fv3_control
 thr mpi dcp rst bit dbg
 ci-test-weather
diff --git a/tests/parm/input.mom6_ccpp.nml.IN b/tests/parm/input.mom6_ccpp.nml.IN
index 870f4dfc5a..0fc5f52233 100644
--- a/tests/parm/input.mom6_ccpp.nml.IN
+++ b/tests/parm/input.mom6_ccpp.nml.IN
@@ -268,9 +268,6 @@
        FSICS    = 99999,
 /
 &nam_stochy
-  lon_s=768,
-  lat_s=384,
-  ntrunc=382,
   SKEBNORM=1,
   SKEB_NPASS=30,
   SKEB_VDOF=5,
diff --git a/tests/rt.conf b/tests/rt.conf
index a4e120fa44..c1669c361e 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -80,7 +80,7 @@ RUN     | fv3_gfs_v15p2
 RUN     | fv3_gfs_v16                                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_restart                                                                                                     |                                         |     | fv3_gfs_v16
 RUN     | fv3_gfs_v16_stochy                                                                                                      |                                         | fv3 |
-RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |  - cheyenne.intel                       | fv3 |
+RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |  - cheyenne.intel jet.intel             | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_c192L127                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
index 90a0532faf..5a892accb0 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -415,9 +415,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210316/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210318/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210316}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210318}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}
diff --git a/tests/utest b/tests/utest
index 6dd1394290..4ba5c5bbfa 100755
--- a/tests/utest
+++ b/tests/utest
@@ -32,11 +32,11 @@ usage() {
   echo
   echo "  Examples"
   echo
-  echo "    'utest -n fv3_ccpp_control' tests all for fv3_ccpp_control"
-  echo "    'utest -n fv3_ccpp_control -c rst' tests restart for fv3_ccpp_control"
-  echo "    'utest -n fv3_ccpp_gfdlmp -c mpi,thr' tests mpi and threading for fv3_ccpp_gfdlmp"
-  echo "    'utest -n fv3_ccpp_gfdlmp -c bit' tests bit for fv3_ccpp_gfdlmp"
-  echo "    'utest -n fv3_ccpp_satmedmf -c dcp,dbg,rst' tests decomposition, debug, restart for fv3_ccpp_satmedmf"
+  echo "    'utest -n fv3_control' tests all for fv3_control"
+  echo "    'utest -n fv3_control -c rst' tests restart for fv3_control"
+  echo "    'utest -n fv3_gfdlmp -c mpi,thr' tests mpi and threading for fv3_gfdlmp"
+  echo "    'utest -n fv3_gfdlmp -c bit' tests bit for fv3_gfdlmp"
+  echo "    'utest -n fv3_satmedmf -c dcp,dbg,rst' tests decomposition, debug, restart for fv3_satmedmf"
   echo
   #set -x
 }
diff --git a/tests/utest.bld b/tests/utest.bld
index 90814bc59e..a2852dbeb9 100644
--- a/tests/utest.bld
+++ b/tests/utest.bld
@@ -1,22 +1,22 @@
-fv3_ccpp_control              | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
-fv3_ccpp_stochy               | SUITES=FV3_GFS_2017
-fv3_ccpp_iau                  | SUITES=FV3_GFS_2017
-fv3_ccpp_ca                   | SUITES=FV3_GFS_2017
-fv3_ccpp_lheatstrg            | SUITES=FV3_GFS_2017
-fv3_ccpp_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_atmwav               | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
-fv3_ccpp_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp_noahmp
-fv3_ccpp_csawmg               | SUITES=FV3_GFS_2017_csawmg
-fv3_ccpp_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
-fv3_ccpp_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
-fv3_ccpp_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
-fv3_ccpp_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_control              | SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
+fv3_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
+fv3_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
+fv3_stochy               | SUITES=FV3_GFS_2017
+fv3_iau                  | SUITES=FV3_GFS_2017
+fv3_ca                   | SUITES=FV3_GFS_2017
+fv3_lheatstrg            | SUITES=FV3_GFS_2017
+fv3_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_gfdlmprad_atmwav     | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+fv3_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_csawmg               | SUITES=FV3_GFS_2017_csawmg
+fv3_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
+fv3_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
+fv3_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
+fv3_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
+fv3_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake

From 37f0da7b82e32a15bf072eaa158399a6b0f2722c Mon Sep 17 00:00:00 2001
From: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com>
Date: Wed, 24 Mar 2021 10:32:36 -0400
Subject: [PATCH 03/10] Add -DAPP=<app_name> cmake option. Add timing info to
 rt logs.  (#477)

* Add -DAPP=<app_name> cmake option
* Add timestamps to all rt jobs
* Add compile time logs
* Remove fv3_msub.IN
* Support xsede/stampede machine

Co-authored-by: Rahul Mahajan <aerorahul@users.noreply.github.com>
Co-authored-by: MinsukJi-NOAA <minsuk.ji@noaa.gov>
---
 CMakeLists.txt                               |  222 ++--
 README.md                                    |    6 +-
 cmake/configure_apps.cmake                   |   55 +
 modulefiles/stampede.intel/fv3               |   55 +-
 tests/RegressionTests_cheyenne.gnu.log       |  144 +--
 tests/RegressionTests_cheyenne.intel.log     |  453 ++++----
 tests/RegressionTests_gaea.intel.log         |  438 ++++----
 tests/RegressionTests_hera.gnu.log           |  144 +--
 tests/RegressionTests_hera.intel.log         |  474 +++++----
 tests/RegressionTests_jet.intel.log          |  292 ++---
 tests/RegressionTests_orion.intel.log        |  478 +++++----
 tests/RegressionTests_stampede.intel.log     |  252 +++++
 tests/RegressionTests_wcoss_cray.log         | 1003 +++++++++---------
 tests/compile.sh                             |   33 +-
 tests/fv3_conf/compile_bsub.IN_wcoss_cray    |    2 +
 tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3 |    2 +
 tests/fv3_conf/compile_qsub.IN_cheyenne      |    2 +
 tests/fv3_conf/compile_qsub.IN_wcoss2        |    2 +
 tests/fv3_conf/compile_slurm.IN_gaea         |    2 +
 tests/fv3_conf/compile_slurm.IN_hera         |    2 +
 tests/fv3_conf/compile_slurm.IN_jet          |    2 +
 tests/fv3_conf/compile_slurm.IN_orion        |    2 +
 tests/fv3_conf/fv3_bsub.IN_wcoss_cray        |    4 +-
 tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3     |    4 +-
 tests/fv3_conf/fv3_msub.IN                   |   31 -
 tests/fv3_conf/fv3_qsub.IN_cheyenne          |    4 +-
 tests/fv3_conf/fv3_qsub.IN_wcoss2            |    4 +-
 tests/fv3_conf/fv3_slurm.IN_gaea             |    6 +-
 tests/fv3_conf/fv3_slurm.IN_hera             |    4 +-
 tests/fv3_conf/fv3_slurm.IN_jet              |    4 +-
 tests/fv3_conf/fv3_slurm.IN_orion            |    4 +-
 tests/fv3_conf/fv3_slurm.IN_stampede         |    8 +-
 tests/rt.conf                                |   40 +-
 tests/rt.sh                                  |   25 +-
 tests/rt_35d.conf                            |   10 +-
 tests/rt_ccpp_dev.conf                       |   14 +-
 tests/rt_gnu.conf                            |   20 +-
 tests/rt_utils.sh                            |   11 +-
 tests/run_compile.sh                         |    4 +
 tests/run_test.sh                            |    4 +
 tests/utest                                  |   17 +-
 tests/utest.bld                              |   44 +-
 42 files changed, 2416 insertions(+), 1911 deletions(-)
 create mode 100644 cmake/configure_apps.cmake
 create mode 100644 tests/RegressionTests_stampede.intel.log
 delete mode 100644 tests/fv3_conf/fv3_msub.IN

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 203a5add81..735f5d8449 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,26 @@ set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
 set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
 set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")
-set(QUAD_PRECISION  ON  CACHE BOOL "Enable QUAD_PRECISION (for certain grid metric terms in dycore)")
 set(REPRO           OFF CACHE BOOL "Enable REPRO mode")
-set(WW3             OFF CACHE BOOL "Enable WW3")
-set(S2S             OFF CACHE BOOL "Enable S2S")
 set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
-set(DATM            OFF CACHE BOOL "Enable Data Atmosphere")
+
+# Component Options
+set(FMS             OFF CACHE BOOL "Enable FMS")
+set(FV3             OFF CACHE BOOL "Enable FV3")
+set(MOM6            OFF CACHE BOOL "Enable MOM6")
+set(CICE6           OFF CACHE BOOL "Enable CICE6")
+set(WW3             OFF CACHE BOOL "Enable WW3")
+set(STOCH_PHYS      OFF CACHE BOOL "Enable Stochastic Physics")
+set(NEMSdatm        OFF CACHE BOOL "Enable NEMSdatm")
+set(CMEPS           OFF CACHE BOOL "Enable CMEPS")
+set(CDEPS           OFF CACHE BOOL "Enable CDEPS")
+
+# Valid applications and choices
+list(APPEND VALID_APPS ATM ATMW S2S S2SW DATM DATM_NEMS)
+set(APP NONE CACHE BOOL "Application Name")
+if(NOT (APP IN_LIST VALID_APPS))
+  message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
+endif()
 
 ###############################################################################
 ### Set CMAKE_BUILD_TYPE for DEBUG mode
@@ -65,7 +79,6 @@ if(CMAKE_Platform)
 endif()
 
 message("")
-message("32BIT ............ ${32BIT}")
 message("AVX2 ............. ${AVX2}")
 message("SIMDMULTIARCH ...  ${SIMDMULTIARCH}")
 message("DEBUG ............ ${DEBUG}")
@@ -74,11 +87,26 @@ message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
 message("OPENMP ........... ${OPENMP}")
 message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
-message("QUAD_PRECISION ... ${QUAD_PRECISION}")
 message("REPRO ............ ${REPRO}")
+message("")
+
+# Configure selected application specific components
+include(cmake/configure_apps.cmake)
+
+# Components
+message("")
+message("FMS .............. ${FMS}")
+message("FV3 .............. ${FV3}")
+message("MOM6 ............. ${MOM6}")
+message("CICE6 ............ ${CICE6}")
 message("WW3 .............. ${WW3}")
-message("S2S .............. ${S2S}")
-message("DATM ............. ${DATM}")
+message("STOCH_PHYS ....... ${STOCH_PHYS}")
+message("NEMSdatm ......... ${NEMSdatm}")
+message("CDEPS ............ ${CDEPS}")
+message("CMEPS ............ ${CMEPS}")
+
+# Options that applications reset
+message("32BIT ............ ${32BIT}")
 message("")
 
 get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)
@@ -105,7 +133,7 @@ if(OPENMP)
 endif()
 find_package(NetCDF REQUIRED C Fortran)
 find_package(ESMF MODULE REQUIRED)
-if(S2S)
+if(CMEPS)
   find_package(PIO REQUIRED COMPONENTS C Fortran STATIC)
 endif()
 
@@ -125,53 +153,40 @@ target_link_libraries(nemsio::nemsio INTERFACE w3emc::w3emc_d bacio::bacio_4)
 find_package(Python 3 REQUIRED COMPONENTS Interpreter)
 message("Found Python: ${Python_EXECUTABLE}")
 
-###############################################################################
-### Checks
-###############################################################################
-if(DATM AND NOT S2S)
-   message(FATAL_ERROR "DATM=ON and S2S=OFF are incompatible, ABORT!")
-endif()
-
-if(S2S AND 32BIT)
-   message(FATAL_ERROR "S2S=ON and 32BIT=ON are incompatible, ABORT!")
-endif()
-
 ###############################################################################
 ### FMS
 ###############################################################################
-set(GFS_PHYS ON CACHE BOOL "Enable GFS Physics")
-if(NOT 32BIT)
-   set(64BIT ON CACHE BOOL "Enable 64-bit")
-
-endif()
-if(NOT QUAD_PRECISION)
-  set(ENABLE_QUAD_PRECISION OFF CACHE BOOL "Enable Quad-precision")
-endif()
+if(FMS)
+  set(GFS_PHYS ON CACHE BOOL "Enable GFS Physics")
+  if(NOT 32BIT)
+    set(64BIT ON CACHE BOOL "Enable 64-bit")
+  endif()
 
-add_subdirectory(FMS)
+  add_subdirectory(FMS)
 
-if(32BIT) 
-   add_library(fms ALIAS fms_r4)
-else()
-   add_library(fms ALIAS fms_r8)
-endif()
+  if(32BIT)
+    add_library(fms ALIAS fms_r4)
+  else()
+    add_library(fms ALIAS fms_r8)
+  endif()
+endif(FMS)
 
 ###############################################################################
 ### stochastic_physics
 ###############################################################################
+if(STOCH_PHYS)
   add_subdirectory(stochastic_physics)
+endif()
 
 ###############################################################################
-### FV3 or Data Atmosphere
+### Atmosphere Components [FV3, MPAS?]
 ###############################################################################
-if(DATM)
-  add_subdirectory(DATM)
-else()
+if(FV3)
   add_subdirectory(FV3)
 endif()
 
 ###############################################################################
-### WW3
+### Wave components [WW3]
 ###############################################################################
 if(WW3)
   if(CMAKE_Platform)
@@ -196,18 +211,39 @@ if(WW3)
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/esmf
     COMMAND ${CMAKE_BUILD_TOOL} WW3_PARCOMPN=4 WW3_COMP=${WW3_COMP} ww3_nemslibonly > ${CMAKE_CURRENT_BINARY_DIR}/ww3_make.log 2>&1)
 
-    set(WW3_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/obj/libww3_multi_esmf.a)
+  set(WW3_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/obj/libww3_multi_esmf.a)
 endif()
 
 ###############################################################################
-### S2S Components [CMEPS, MOM6, CICE]
+### Marine Components [MOM6, CICE6]
 ###############################################################################
-if(S2S)
-  add_subdirectory(CMEPS-interface)
+if(MOM6)
   add_subdirectory(MOM6-interface)
+endif()
+
+if(CICE6)
   add_subdirectory(CICE-interface)
 endif()
 
+###############################################################################
+### Mediator Components [CMEPS]
+###############################################################################
+if(CMEPS)
+  add_subdirectory(CMEPS-interface)
+endif()
+
+###############################################################################
+### Data Components [NEMSdatm, CDEPS]
+###############################################################################
+if(NEMSdatm)
+  add_subdirectory(DATM)
+endif()
+
+if(CDEPS)
+  message("ADD CDEPS-interface directory")
+#  add_subdirectory(CDEPS-interface)
+endif()
+
 ###############################################################################
 ### UFS Library [NEMS]
 ###############################################################################
@@ -234,77 +270,97 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/NEMS/src/ESMFConvenienceMacros.h
                COPYONLY)
 
 add_library(ufs ${_nems_srcs})
+set_target_properties(ufs PROPERTIES Fortran_MODULE_DIRECTORY
+                                     ${CMAKE_CURRENT_BINARY_DIR}/mod)
+target_include_directories(ufs PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/NEMS/src)
+target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
+                                         $<INSTALL_INTERFACE:mod>)
 
-list(APPEND _ufs_defs_private ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR}
-                              FRONT_FMS)
-add_dependencies(ufs fms)
+list(APPEND _ufs_defs_private ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR})
 
-if(DATM)
-  list(APPEND _ufs_defs_private FRONT_DATM=datm)
-  add_dependencies(ufs datatm)
-else()
-  list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)
-  add_dependencies(ufs fv3atm)
-endif()
 if(JEDI_DRIVER)
   list(APPEND _ufs_defs_private JEDI_DRIVER=ON)
 endif()
-set_target_properties(ufs PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
-target_include_directories(ufs PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/NEMS/src)
 
 if(WW3)
+  add_dependencies(ufs ww3_nems)
   list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
   target_include_directories(ufs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/mod)
-  add_dependencies(ufs ww3_nems)
-  target_link_libraries(ufs PUBLIC ${WW3_LIBS})
+  list(APPEND _ufs_libs_public ${WW3_LIBS})
 endif()
 
-target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
-                                         $<INSTALL_INTERFACE:mod>)
+list(APPEND _ufs_libs_public esmf)
 
-target_link_libraries(ufs PUBLIC esmf stochastic_physics)
+if(STOCH_PHYS)
+  list(APPEND _ufs_libs_public stochastic_physics)
+endif()
 
-if(DATM)
-  target_link_libraries(ufs PUBLIC datatm)
-else()
-  target_link_libraries(ufs PUBLIC fv3atm)
+if(FMS)
+  add_dependencies(ufs fms)
+  list(APPEND _ufs_defs_private FRONT_FMS)
+endif()
+
+if(NEMSdatm)
+  add_dependencies(ufs datatm)
+  list(APPEND _ufs_defs_private FRONT_DATM=datm)
+  list(APPEND _ufs_libs_public datatm)
+endif()
+
+if(FV3)
+  add_dependencies(ufs fv3atm)
+  list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)
+  list(APPEND _ufs_libs_public fv3atm)
 endif()
 
-if(S2S)
-  list(APPEND _ufs_defs_private FRONT_MOM6=mom_cap_mod
-                                FRONT_CICE6=ice_comp_nuopc
-                                CMEPS
-                                FRONT_CMEPS=MED)
-  add_dependencies(ufs mom6 cice cmeps stochastic_physics)
-  target_link_libraries(ufs PUBLIC mom6
-                                   cice
-                                   cmeps)
+if(MOM6)
+  add_dependencies(ufs mom6)
+  list(APPEND _ufs_defs_private FRONT_MOM6=mom_cap_mod)
+  list(APPEND _ufs_libs_public mom6)
+endif()
+
+if(CICE6)
+  add_dependencies(ufs cice)
+  list(APPEND _ufs_defs_private FRONT_CICE6=ice_comp_nuopc)
+  list(APPEND _ufs_libs_public cice)
+endif()
+
+if(CMEPS)
+  add_dependencies(ufs cmeps)
+  list(APPEND _ufs_defs_private CMEPS FRONT_CMEPS=MED)
+  list(APPEND _ufs_libs_public cmeps)
+endif()
+
+if(CDEPS)
+  message("Do CDEPS things here")
 endif()
 
 target_compile_definitions(ufs PRIVATE "${_ufs_defs_private}")
+target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 
 ###############################################################################
 ### UFS executable
 ###############################################################################
 add_executable(ufs_model NEMS/src/MAIN_NEMS.F90)
+add_dependencies(ufs_model ufs)
 
 list(APPEND _ufs_model_defs_private ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR})
 
-set_target_properties(ufs_model PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
+set_target_properties(ufs_model PROPERTIES Fortran_MODULE_DIRECTORY
+                                           ${CMAKE_CURRENT_BINARY_DIR}/mod)
 
 target_include_directories(ufs_model PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/NEMS/src)
 
 if(WW3)
   list(APPEND _ufs_model_defs_private FRONT_WW3=WMESMFMD)
   target_include_directories(ufs_model PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/mod)
-  add_dependencies(ufs_model ww3_nems)
 endif()
 
 target_compile_definitions(ufs_model PRIVATE "${_ufs_model_defs_private}")
 
-if(DATM)
+if(NEMSdatm)
   target_link_libraries(ufs_model PUBLIC ufs w3nco::w3nco_d)
 endif()
+
 target_link_libraries(ufs_model PRIVATE ufs
                                         esmf
                                         NetCDF::NetCDF_Fortran)
@@ -312,18 +368,16 @@ target_link_libraries(ufs_model PRIVATE ufs
 ###############################################################################
 ### Install
 ###############################################################################
-install(
-  TARGETS ufs
+install(TARGETS ufs
+        EXPORT  ufs-config
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
 
-  EXPORT ufs-config
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib)
+install(EXPORT      ufs-config
+        DESTINATION lib/cmake)
 
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-install(EXPORT ufs-config
-  DESTINATION lib/cmake
-)
 ###############################################################################
 ### Done
 ###############################################################################
diff --git a/README.md b/README.md
index 20453c6eaa..53e324d71c 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,12 @@ The top level directory structure groups source code and input files as follow:
 
 E.g. use of `build.sh` to build the coupled model with `FV3_GFS_v15p2` as the CCPP suite.
 ```
-$> CMAKE_FLAGS="-DS2S=ON" CCPP_SUITES="FV3_GFS_v15p2" ./build.sh
+$> CMAKE_FLAGS="-DAPP=S2S" CCPP_SUITES="FV3_GFS_v15p2" ./build.sh
 ```
+The build system is regularly tested with [Tier-1 and Tier-2 platforms](
+https://github.com/ufs-community/ufs-weather-model/wiki/Regression-Test-Policy-for-Weather-Model-Platforms-and-Compilers).
+Configurations for other platforms that are available with UFS should be used with the understanding that they are not regularly
+tested and users will have to adapt those to make it work.
 
 # Disclaimer
 
diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
new file mode 100644
index 0000000000..a02c79e30a
--- /dev/null
+++ b/cmake/configure_apps.cmake
@@ -0,0 +1,55 @@
+###############################################################################
+### Doc
+# This file turns ON (only ON, not OFF) a component in a valid application
+# If a user wishes to add a new application, they should add an
+# Application handle (APP_NAME) in the list of `VALID_APPS` in the
+# top-level CMakeLists.txt
+# Next, they can define an if-endif block with that APP_NAME and
+# turn ON the components specific to this new application.
+# Note, only the components required for the application should be turned ON.
+# It is forbidden to turn OFF or change any other CMake option in this file.
+###############################################################################
+
+###############################################################################
+### Configure Application Components
+###############################################################################
+if(APP MATCHES "^(ATM|ATMW)$")
+  set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
+  set(FV3        ON  CACHE BOOL "Enable FV3"                 FORCE)
+  set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
+  if(APP MATCHES "ATMW")
+    set(WW3      ON  CACHE BOOL "Enable WAVEWATCH III"       FORCE)
+    message("Configuring UFS app in Atmosphere with Waves mode")
+  else()
+    message("Configuring UFS app in Atmosphere Only mode")
+  endif()
+endif()
+
+if(APP MATCHES "^(DATM|DATM_NEMS)$")
+  set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
+  set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
+  set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
+  set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
+  if(APP MATCHES "DATM_NEMS")
+    set(NEMSdatm ON  CACHE BOOL "Enable NEMS DataAtm"        FORCE)
+    message("Configuring UFS app in (NEMS) Data Atmosphere mode")
+  elseif(APP MATCHES "DATM")
+    set(CDEPS    ON  CACHE BOOL "Enable CDEPS"               FORCE)
+    message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
+  endif()
+endif()
+
+if(APP MATCHES "^(S2S|S2SW)$")
+  set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
+  set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
+  set(FV3        ON  CACHE BOOL "Enable FV3"                 FORCE)
+  set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
+  set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
+  set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
+  if(APP MATCHES "S2SW")
+    set(WW3      ON  CACHE BOOL "Enable WAVEWATCH III"       FORCE)
+    message("Configuring UFS app in S2S with Waves mode")
+  else()
+    message("Configuring UFS app in S2S mode")
+  endif()
+endif()
diff --git a/modulefiles/stampede.intel/fv3 b/modulefiles/stampede.intel/fv3
index 76b7500cbc..b1ca38a351 100644
--- a/modulefiles/stampede.intel/fv3
+++ b/modulefiles/stampede.intel/fv3
@@ -12,38 +12,37 @@ module-whatis "loads NEMS FV3 prerequisites for Stampede/Intel"
 # handled by the module-setup.sh (or .csh) script.
 
 ##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
+## NCEP libraries
 ##
-module load intel/18.0.2
-module load impi/18.0.2
+module use /work/08048/hanglei/NCEP/install/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
+module load hpc-intel/18.0.2
+module load hpc-impi/18.0.2
 module load python3/3.7.0
 
-##
-## use pre-compiled ESMF and NCEP libraries for above compiler / MPI combination
-##
-# DH* todo - shared directory
-module use -a /work/06146/tg854455/stampede2/ufs-stack-20200909/intel-18.0.2/impi-18.0.2/modules
-# *DH
-
-module load libpng/1.6.35
-module load netcdf/4.7.4
-module load esmf/8.1.0bs27
-
-module load bacio/2.4.0
+module load bacio/2.4.1
 module load crtm/2.3.0
-module load g2/3.4.0
-module load g2tmpl/1.9.0
-module load ip/3.3.0
-module load nceppost/dceca26
-module load nemsio/2.5.1
-module load sp/2.3.0
-module load w3emc/2.7.0
-module load w3nco/2.4.0
-
-module load gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.0
+
+module load gfsio/1.4.1
+module load sfcio/1.4.1
+module load sigio/2.3.2
+
+module load jasper/2.0.25
+module load png/1.6.35
+module load zlib/1.2.11
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.2
+module load esmf/8_1_0_beta_snapshot_27
 
 ##
 ## load cmake
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
index 3bf1877863..427578d950 100644
--- a/tests/RegressionTests_cheyenne.gnu.log
+++ b/tests/RegressionTests_cheyenne.gnu.log
@@ -1,9 +1,19 @@
-Thu Mar 18 13:19:36 MDT 2021
+Tue Mar 23 10:02:26 MDT 2021
 Start Regression test
 
+Compile 001 elapsed time 331 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp
+Compile 002 elapsed time 330 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 003 elapsed time 372 seconds. APP=ATM SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y
+Compile 004 elapsed time 337 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 005 elapsed time 300 seconds. APP=ATM 32BIT=Y DEBUG=Y
+Compile 006 elapsed time 180 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP DEBUG=Y
+Compile 007 elapsed time 370 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
+Compile 008 elapsed time 184 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 009 elapsed time 454 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled
+Compile 010 elapsed time 376 seconds. APP=DATM_NEMS
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfdlmp
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfdlmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfdlmp
 Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -48,13 +58,13 @@ Checking test 001 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 72.427329
+The total amount of wall time                        = 73.822607
 
 Test 001 fv3_gfdlmp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v15p2
 Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -119,13 +129,13 @@ Checking test 002 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 136.941182
+The total amount of wall time                        = 142.583647
 
 Test 002 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16
 Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -202,13 +212,13 @@ Checking test 003 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.465164
+The total amount of wall time                        = 187.862691
 
 Test 003 fv3_gfs_v16 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_restart
 Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -255,13 +265,13 @@ Checking test 004 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 95.241565
+The total amount of wall time                        = 96.737676
 
 Test 004 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_stochy
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_stochy
 Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -326,13 +336,13 @@ Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 89.065852
+The total amount of wall time                        = 89.151107
 
 Test 005 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_flake
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_flake
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_flake
 Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -397,13 +407,13 @@ Checking test 006 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 144.758066
+The total amount of wall time                        = 150.318528
 
 Test 006 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v15p2_RRTMGP
 Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -468,13 +478,13 @@ Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 233.688023
+The total amount of wall time                        = 257.751810
 
 Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_RRTMGP
 Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -539,13 +549,13 @@ Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 262.519106
+The total amount of wall time                        = 264.075689
 
 Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gsd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gsd
 Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -634,13 +644,13 @@ Checking test 009 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 352.206210
+The total amount of wall time                        = 354.707006
 
 Test 009 fv3_gsd PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_thompson
 Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -705,13 +715,13 @@ Checking test 010 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 166.159439
+The total amount of wall time                        = 165.624665
 
 Test 010 fv3_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_no_aero
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_thompson_no_aero
 Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -776,13 +786,13 @@ Checking test 011 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 159.091610
+The total amount of wall time                        = 158.885758
 
 Test 011 fv3_thompson_no_aero PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_rrfs_v1beta
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_rrfs_v1beta
 Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -847,13 +857,13 @@ Checking test 012 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 181.064238
+The total amount of wall time                        = 181.237842
 
 Test 012 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_HAFS_v0_hwrf_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_HAFS_v0_hwrf_thompson
 Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -918,13 +928,13 @@ Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 243.144962
+The total amount of wall time                        = 259.165626
 
 Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -939,13 +949,13 @@ Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 460.237050
+The total amount of wall time                        = 461.066887
 
 Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfsv16_ugwpv1
 Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1004,13 +1014,13 @@ Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 298.148424
+The total amount of wall time                        = 306.507474
 
 Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfsv16_ugwpv1_warmstart
 Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1069,13 +1079,13 @@ Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 303.021790
+The total amount of wall time                        = 305.432456
 
 Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_ras
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_ras
 Checking test 017 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1140,13 +1150,13 @@ Checking test 017 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 167.885537
+The total amount of wall time                        = 167.196042
 
 Test 017 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_control_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_control_debug
 Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1173,13 +1183,13 @@ Checking test 018 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 77.618175
+The total amount of wall time                        = 75.360078
 
 Test 018 fv3_control_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_regional_control_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_regional_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_regional_control_debug
 Checking test 019 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1187,13 +1197,13 @@ Checking test 019 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 186.595065
+The total amount of wall time                        = 186.920286
 
 Test 019 fv3_regional_control_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_rrfs_v1beta_debug
 Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1258,13 +1268,13 @@ Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.971979
+The total amount of wall time                        = 109.698301
 
 Test 020 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gsd_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gsd_debug
 Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1329,13 +1339,13 @@ Checking test 021 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.480241
+The total amount of wall time                        = 115.629137
 
 Test 021 fv3_gsd_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_thompson_debug
 Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1400,13 +1410,13 @@ Checking test 022 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 186.048865
+The total amount of wall time                        = 184.849713
 
 Test 022 fv3_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_thompson_no_aero_debug
 Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1471,13 +1481,13 @@ Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 177.982636
+The total amount of wall time                        = 178.640481
 
 Test 023 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v15p2_debug
 Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1542,13 +1552,13 @@ Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 137.547670
+The total amount of wall time                        = 135.283433
 
 Test 024 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_debug
 Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1613,13 +1623,13 @@ Checking test 025 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.621232
+The total amount of wall time                        = 98.621448
 
 Test 025 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1694,13 @@ Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 198.750607
+The total amount of wall time                        = 198.764803
 
 Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_RRTMGP_debug
 Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1755,13 +1765,13 @@ Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 205.621718
+The total amount of wall time                        = 205.615144
 
 Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_multigases
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_multigases
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_multigases
 Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1832,13 +1842,13 @@ Checking test 028 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 174.473162
+The total amount of wall time                        = 176.982886
 
 Test 028 fv3_multigases PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1903,13 +1913,13 @@ Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 112.451863
+The total amount of wall time                        = 113.203162
 
 Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1924,13 +1934,13 @@ Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 216.026078
+The total amount of wall time                        = 216.377887
 
 Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfsv16_ugwpv1_debug
 Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1989,13 +1999,13 @@ Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 305.011925
+The total amount of wall time                        = 304.979048
 
 Test 031 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_15042/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_56728/fv3_gfs_v16_ras_debug
 Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2060,11 +2070,11 @@ Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 172.520721
+The total amount of wall time                        = 173.459798
 
 Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Thu Mar 18 13:37:55 MDT 2021
-Elapsed time: 00h:18m:19s. Have a nice day!
+Tue Mar 23 10:24:42 MDT 2021
+Elapsed time: 00h:22m:16s. Have a nice day!
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
index f4158365a7..63c6e1bf20 100644
--- a/tests/RegressionTests_cheyenne.intel.log
+++ b/tests/RegressionTests_cheyenne.intel.log
@@ -1,9 +1,28 @@
-Thu Mar 18 13:19:41 MDT 2021
+Tue Mar 23 10:02:03 MDT 2021
 Start Regression test
 
+Compile 001 elapsed time 699 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 672 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 003 elapsed time 734 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 004 elapsed time 725 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 005 elapsed time 765 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 006 elapsed time 866 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 007 elapsed time 960 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 008 elapsed time 826 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 009 elapsed time 729 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 010 elapsed time 780 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 011 elapsed time 837 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 012 elapsed time 254 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 013 elapsed time 260 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 014 elapsed time 251 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 015 elapsed time 1015 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 016 elapsed time 1103 seconds. APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 017 elapsed time 350 seconds. APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 018 elapsed time 651 seconds. APP=DATM_NEMS
+Compile 019 elapsed time 240 seconds. APP=DATM_NEMS DEBUG=Y
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +87,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.958572
+The total amount of wall time                        = 48.178755
 
 Test 001 fv3_control PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_decomp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +158,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 48.067631
+The total amount of wall time                        = 47.868721
 
 Test 002 fv3_decomp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_2threads
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +229,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.388280
+The total amount of wall time                        = 106.639135
 
 Test 003 fv3_2threads PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +282,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 22.917253
+The total amount of wall time                        = 23.548673
 
 Test 004 fv3_restart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_read_inc
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +353,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.473873
+The total amount of wall time                        = 47.049568
 
 Test 005 fv3_read_inc PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf_esmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +404,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 122.527143
+The total amount of wall time                        = 123.631961
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +455,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.852420
+The total amount of wall time                        = 46.195175
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_netcdf_parallel
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -452,7 +471,7 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile6.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
- Comparing dynf000.nc ............ALT CHECK......OK
+ Comparing dynf000.nc .........OK
  Comparing dynf024.nc ............ALT CHECK......OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
@@ -487,13 +506,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.080210
+The total amount of wall time                        = 47.101523
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGlatlon_netcdf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +557,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.236247
+The total amount of wall time                        = 46.112194
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_nemsio
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +608,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.047256
+The total amount of wall time                        = 46.426691
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_wrtGauss_nemsio_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +659,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.070683
+The total amount of wall time                        = 123.357213
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +730,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 54.625384
+The total amount of wall time                        = 56.835528
 
 Test 012 fv3_stochy PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_ca
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +801,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 29.444011
+The total amount of wall time                        = 28.790625
 
 Test 013 fv3_ca PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_lndp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +872,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.987457
+The total amount of wall time                        = 51.596543
 
 Test 014 fv3_lndp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_iau
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +943,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.283016
+The total amount of wall time                        = 46.879389
 
 Test 015 fv3_iau PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_lheatstrg
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +994,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.276234
+The total amount of wall time                        = 45.983111
 
 Test 016 fv3_lheatstrg PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_multigases_repro
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_multigases_repro
 Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1071,13 @@ Checking test 017 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 111.440695
+The total amount of wall time                        = 112.612255
 
 Test 017 fv3_multigases PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control_32bit
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_control_32bit
 Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1123,13 +1142,13 @@ Checking test 018 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 40.434938
+The total amount of wall time                        = 39.816619
 
 Test 018 fv3_control_32bit PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_stretched
 Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1182,13 +1201,13 @@ Checking test 019 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 324.010684
+The total amount of wall time                        = 332.376233
 
 Test 019 fv3_stretched PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched_nest
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_stretched_nest
 Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1252,13 +1271,13 @@ Checking test 020 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 352.560075
+The total amount of wall time                        = 352.138405
 
 Test 020 fv3_stretched_nest PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_control
 Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1266,25 +1285,25 @@ Checking test 021 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 714.905067
+The total amount of wall time                        = 721.330913
 
 Test 021 fv3_regional_control PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_restart
 Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 382.830994
+The total amount of wall time                        = 395.221716
 
 Test 022 fv3_regional_restart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_quilt
 Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1295,13 +1314,13 @@ Checking test 023 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 721.119525
+The total amount of wall time                        = 739.701537
 
 Test 023 fv3_regional_quilt PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt_hafs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_quilt_hafs
 Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1310,27 +1329,27 @@ Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 717.041861
+The total amount of wall time                        = 736.434029
 
 Test 024 fv3_regional_quilt_hafs PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_quilt_netcdf_parallel
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_quilt_netcdf_parallel
 Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
- Comparing dynf000.nc ............ALT CHECK......OK
- Comparing dynf024.nc ............ALT CHECK......OK
- Comparing phyf000.nc ............ALT CHECK......OK
+ Comparing dynf000.nc .........OK
+ Comparing dynf024.nc .........OK
+ Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 717.890376
+The total amount of wall time                        = 739.713307
 
 Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfdlmp
 Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1375,13 +1394,13 @@ Checking test 026 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.663537
+The total amount of wall time                        = 53.464722
 
 Test 026 fv3_gfdlmp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_gwd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfdlmprad_gwd
 Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1426,13 +1445,13 @@ Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.955815
+The total amount of wall time                        = 53.006336
 
 Test 027 fv3_gfdlmprad_gwd PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_noahmp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfdlmprad_noahmp
 Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1477,13 +1496,13 @@ Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.663012
+The total amount of wall time                        = 54.069160
 
 Test 028 fv3_gfdlmprad_noahmp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_csawmg
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_csawmg
 Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1528,13 +1547,13 @@ Checking test 029 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 140.600685
+The total amount of wall time                        = 141.686452
 
 Test 029 fv3_csawmg PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_satmedmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_satmedmf
 Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1579,13 +1598,13 @@ Checking test 030 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.721545
+The total amount of wall time                        = 59.566593
 
 Test 030 fv3_satmedmf PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_satmedmfq
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_satmedmfq
 Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1630,13 +1649,13 @@ Checking test 031 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.607443
+The total amount of wall time                        = 59.229744
 
 Test 031 fv3_satmedmfq PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmp_32bit
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfdlmp_32bit
 Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1681,13 +1700,13 @@ Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 42.216585
+The total amount of wall time                        = 41.624572
 
 Test 032 fv3_gfdlmp_32bit PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfdlmprad_32bit_post
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfdlmprad_32bit_post
 Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1736,13 +1755,13 @@ Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 73.153192
+The total amount of wall time                        = 72.784409
 
 Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_cpt
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_cpt
 Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1793,13 +1812,13 @@ Checking test 034 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 328.693268
+The total amount of wall time                        = 331.355609
 
 Test 034 fv3_cpt PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gsd
 Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1907,13 @@ Checking test 035 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 198.976083
+The total amount of wall time                        = 202.125869
 
 Test 035 fv3_gsd PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rap
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_rap
 Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1978,13 @@ Checking test 036 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 101.175017
+The total amount of wall time                        = 101.714197
 
 Test 036 fv3_rap PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_hrrr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_hrrr
 Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2049,13 @@ Checking test 037 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.708498
+The total amount of wall time                        = 106.224389
 
 Test 037 fv3_hrrr PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_thompson
 Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2101,13 +2120,13 @@ Checking test 038 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 94.770375
+The total amount of wall time                        = 96.969428
 
 Test 038 fv3_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_no_aero
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_thompson_no_aero
 Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2172,13 +2191,13 @@ Checking test 039 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 91.204857
+The total amount of wall time                        = 90.728528
 
 Test 039 fv3_thompson_no_aero PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rrfs_v1beta
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_rrfs_v1beta
 Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2243,13 +2262,13 @@ Checking test 040 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 107.160438
+The total amount of wall time                        = 107.279906
 
 Test 040 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16
 Checking test 041 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2326,13 +2345,13 @@ Checking test 041 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 129.958834
+The total amount of wall time                        = 130.505196
 
 Test 041 fv3_gfs_v16 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_restart
 Checking test 042 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2379,13 +2398,13 @@ Checking test 042 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 67.685012
+The total amount of wall time                        = 68.582090
 
 Test 042 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_stochy
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_stochy
 Checking test 043 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2450,13 +2469,13 @@ Checking test 043 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 61.220929
+The total amount of wall time                        = 62.889352
 
 Test 043 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_RRTMGP
 Checking test 044 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2521,13 +2540,13 @@ Checking test 044 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 225.546934
+The total amount of wall time                        = 224.082495
 
 Test 044 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 045 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2586,13 +2605,13 @@ Checking test 045 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 831.881649
+The total amount of wall time                        = 928.334238
 
 Test 045 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_2thrd
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 046 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2657,13 +2676,13 @@ Checking test 046 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 464.680179
+The total amount of wall time                        = 477.074774
 
 Test 046 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gocart_clm
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gocart_clm
 Checking test 047 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2708,13 +2727,13 @@ Checking test 047 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.082096
+The total amount of wall time                        = 55.320850
 
 Test 047 fv3_gocart_clm PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_flake
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_flake
 Checking test 048 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2779,13 +2798,13 @@ Checking test 048 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 117.009840
+The total amount of wall time                        = 116.427427
 
 Test 048 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_HAFS_v0_hwrf_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_HAFS_v0_hwrf_thompson
 Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2850,13 +2869,13 @@ Checking test 049 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 181.728184
+The total amount of wall time                        = 195.904103
 
 Test 049 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -2871,13 +2890,13 @@ Checking test 050 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 318.936857
+The total amount of wall time                        = 318.947790
 
 Test 050 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfsv16_ugwpv1
 Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2936,13 +2955,13 @@ Checking test 051 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 216.580824
+The total amount of wall time                        = 217.260557
 
 Test 051 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfsv16_ugwpv1_warmstart
 Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3001,13 +3020,13 @@ Checking test 052 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 215.713858
+The total amount of wall time                        = 215.968637
 
 Test 052 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_ras
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_ras
 Checking test 053 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3072,13 +3091,13 @@ Checking test 053 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 115.663476
+The total amount of wall time                        = 115.543656
 
 Test 053 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v15p2_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v15p2_debug
 Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3143,13 +3162,13 @@ Checking test 054 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 244.322214
+The total amount of wall time                        = 245.121956
 
 Test 054 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_debug
 Checking test 055 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3214,13 +3233,13 @@ Checking test 055 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 190.266804
+The total amount of wall time                        = 190.269671
 
 Test 055 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3285,13 +3304,13 @@ Checking test 056 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 386.139272
+The total amount of wall time                        = 386.179513
 
 Test 056 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_RRTMGP_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_RRTMGP_debug
 Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3356,13 +3375,13 @@ Checking test 057 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 391.135094
+The total amount of wall time                        = 393.762440
 
 Test 057 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_regional_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_regional_control_debug
 Checking test 058 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3370,13 +3389,13 @@ Checking test 058 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 367.762370
+The total amount of wall time                        = 367.914286
 
 Test 058 fv3_regional_control_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_control_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_control_debug
 Checking test 059 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3403,13 +3422,13 @@ Checking test 059 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 147.442953
+The total amount of wall time                        = 146.617398
 
 Test 059 fv3_control_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_stretched_nest_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_stretched_nest_debug
 Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3426,13 +3445,13 @@ Checking test 060 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 433.260613
+The total amount of wall time                        = 433.869722
 
 Test 060 fv3_stretched_nest_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gsd_debug
 Checking test 061 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3497,13 +3516,13 @@ Checking test 061 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 216.558308
+The total amount of wall time                        = 216.723020
 
 Test 061 fv3_gsd_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gsd_diag3d_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gsd_diag3d_debug
 Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3568,13 +3587,13 @@ Checking test 062 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 262.674351
+The total amount of wall time                        = 265.472296
 
 Test 062 fv3_gsd_diag3d_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_thompson_debug
 Checking test 063 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3639,13 +3658,13 @@ Checking test 063 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 359.965520
+The total amount of wall time                        = 360.098930
 
 Test 063 fv3_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_thompson_no_aero_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_thompson_no_aero_debug
 Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3710,13 +3729,13 @@ Checking test 064 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 347.570263
+The total amount of wall time                        = 347.542197
 
 Test 064 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_rrfs_v1beta_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_rrfs_v1beta_debug
 Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3781,13 +3800,13 @@ Checking test 065 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 209.696788
+The total amount of wall time                        = 209.333728
 
 Test 065 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3852,13 +3871,13 @@ Checking test 066 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 222.971545
+The total amount of wall time                        = 223.613218
 
 Test 066 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3873,13 +3892,13 @@ Checking test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 396.434516
+The total amount of wall time                        = 397.115334
 
 Test 067 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfsv16_ugwpv1_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfsv16_ugwpv1_debug
 Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3938,13 +3957,13 @@ Checking test 068 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 602.823082
+The total amount of wall time                        = 604.069957
 
 Test 068 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/fv3_gfs_v16_ras_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/fv3_gfs_v16_ras_debug
 Checking test 069 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4009,13 +4028,13 @@ Checking test 069 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 342.964276
+The total amount of wall time                        = 342.678273
 
 Test 069 fv3_gfs_v16_ras_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_control
 Checking test 070 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4065,13 +4084,13 @@ Checking test 070 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 99.168593
+The total amount of wall time                        = 99.211920
 
 Test 070 cpld_control PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart
 Checking test 071 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4121,13 +4140,13 @@ Checking test 071 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 55.667218
+The total amount of wall time                        = 55.480542
 
 Test 071 cpld_restart PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_controlfrac
 Checking test 072 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4177,13 +4196,13 @@ Checking test 072 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 95.002092
+The total amount of wall time                        = 98.419990
 
 Test 072 cpld_controlfrac PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restartfrac
 Checking test 073 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4233,13 +4252,13 @@ Checking test 073 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 54.074622
+The total amount of wall time                        = 54.817555
 
 Test 073 cpld_restartfrac PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_2threads
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_2threads
 Checking test 074 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4289,13 +4308,13 @@ Checking test 074 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 259.441104
+The total amount of wall time                        = 260.478892
 
 Test 074 cpld_2threads PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_decomp
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_decomp
 Checking test 075 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4345,13 +4364,13 @@ Checking test 075 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 96.105468
+The total amount of wall time                        = 96.451004
 
 Test 075 cpld_decomp PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_satmedmf
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_satmedmf
 Checking test 076 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4401,13 +4420,13 @@ Checking test 076 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 93.120103
+The total amount of wall time                        = 96.401051
 
 Test 076 cpld_satmedmf PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_ca
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_ca
 Checking test 077 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4457,13 +4476,13 @@ Checking test 077 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 96.397273
+The total amount of wall time                        = 97.547900
 
 Test 077 cpld_ca PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_control_c192
 Checking test 078 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4513,13 +4532,13 @@ Checking test 078 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 401.073510
+The total amount of wall time                        = 411.206890
 
 Test 078 cpld_control_c192 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart_c192
 Checking test 079 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4569,13 +4588,13 @@ Checking test 079 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 289.528245
+The total amount of wall time                        = 295.653758
 
 Test 079 cpld_restart_c192 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_controlfrac_c192
 Checking test 080 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4625,13 +4644,13 @@ Checking test 080 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 410.274779
+The total amount of wall time                        = 408.293885
 
 Test 080 cpld_controlfrac_c192 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac_c192
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restartfrac_c192
 Checking test 081 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4681,13 +4700,13 @@ Checking test 081 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 292.162685
+The total amount of wall time                        = 298.385402
 
 Test 081 cpld_restartfrac_c192 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_control_c384
 Checking test 082 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4740,13 +4759,13 @@ Checking test 082 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1575.556051
+The total amount of wall time                        = 1601.371689
 
 Test 082 cpld_control_c384 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart_c384
 Checking test 083 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4799,13 +4818,13 @@ Checking test 083 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 842.742485
+The total amount of wall time                        = 841.967363
 
 Test 083 cpld_restart_c384 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_controlfrac_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_controlfrac_c384
 Checking test 084 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4858,13 +4877,13 @@ Checking test 084 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1588.019550
+The total amount of wall time                        = 1592.004091
 
 Test 084 cpld_controlfrac_c384 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restartfrac_c384
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restartfrac_c384
 Checking test 085 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4917,13 +4936,13 @@ Checking test 085 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 828.257714
+The total amount of wall time                        = 838.836412
 
 Test 085 cpld_restartfrac_c384 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmark
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmark
 Checking test 086 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4976,13 +4995,13 @@ Checking test 086 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 911.514819
+The total amount of wall time                        = 910.340201
 
 Test 086 cpld_bmark PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmark
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart_bmark
 Checking test 087 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5035,13 +5054,13 @@ Checking test 087 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 493.418354
+The total amount of wall time                        = 482.987624
 
 Test 087 cpld_restart_bmark PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmarkfrac
 Checking test 088 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5094,13 +5113,13 @@ Checking test 088 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 915.905406
+The total amount of wall time                        = 905.071576
 
 Test 088 cpld_bmarkfrac PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmarkfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart_bmarkfrac
 Checking test 089 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5153,13 +5172,13 @@ Checking test 089 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 491.543561
+The total amount of wall time                        = 493.685792
 
 Test 089 cpld_restart_bmarkfrac PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmarkfrac_v16
 Checking test 090 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5212,13 +5231,13 @@ Checking test 090 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 1639.823971
+The total amount of wall time                        = 1631.797689
 
 Test 090 cpld_bmarkfrac_v16 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_restart_bmarkfrac_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_restart_bmarkfrac_v16
 Checking test 091 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5271,13 +5290,13 @@ Checking test 091 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-The total amount of wall time                        = 867.579293
+The total amount of wall time                        = 876.604526
 
 Test 091 cpld_restart_bmarkfrac_v16 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmark_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmark_wave
 Checking test 092 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5333,13 +5352,13 @@ Checking test 092 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1525.613086
+The total amount of wall time                        = 1568.580930
 
 Test 092 cpld_bmark_wave PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmarkfrac_wave
 Checking test 093 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5395,13 +5414,13 @@ Checking test 093 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 1582.184637
+The total amount of wall time                        = 1571.671695
 
 Test 093 cpld_bmarkfrac_wave PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_bmarkfrac_wave_v16
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_bmarkfrac_wave_v16
 Checking test 094 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5456,13 +5475,13 @@ Checking test 094 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-The total amount of wall time                        = 1046.151554
+The total amount of wall time                        = 1058.786853
 
 Test 094 cpld_bmarkfrac_wave_v16 PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_control_wave
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_control_wave
 Checking test 095 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5515,13 +5534,13 @@ Checking test 095 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-The total amount of wall time                        = 808.664644
+The total amount of wall time                        = 815.612195
 
 Test 095 cpld_control_wave PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_debug
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_debug
 Checking test 096 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5571,13 +5590,13 @@ Checking test 096 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 306.754779
+The total amount of wall time                        = 306.791877
 
 Test 096 cpld_debug PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/cpld_debugfrac
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/cpld_debugfrac
 Checking test 097 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5627,73 +5646,73 @@ Checking test 097 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 305.357800
+The total amount of wall time                        = 305.455981
 
 Test 097 cpld_debugfrac PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_control_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_control_cfsr
 Checking test 098 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 102.539148
+The total amount of wall time                        = 102.438765
 
 Test 098 datm_control_cfsr PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_restart_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_restart_cfsr
 Checking test 099 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 64.278362
+The total amount of wall time                        = 63.790987
 
 Test 099 datm_restart_cfsr PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_control_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_control_gefs
 Checking test 100 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 96.288880
+The total amount of wall time                        = 95.432646
 
 Test 100 datm_control_gefs PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_bulk_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_bulk_cfsr
 Checking test 101 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 98.708313
+The total amount of wall time                        = 98.813916
 
 Test 101 datm_bulk_cfsr PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_bulk_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_bulk_gefs
 Checking test 102 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 93.157359
+The total amount of wall time                        = 96.660125
 
 Test 102 datm_bulk_gefs PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_mx025_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_mx025_cfsr
 Checking test 103 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5702,13 +5721,13 @@ Checking test 103 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 377.314568
+The total amount of wall time                        = 411.142194
 
 Test 103 datm_mx025_cfsr PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_mx025_gefs
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_mx025_gefs
 Checking test 104 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5717,23 +5736,23 @@ Checking test 104 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 390.675084
+The total amount of wall time                        = 391.332862
 
 Test 104 datm_mx025_gefs PASS
 
 
 baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
-working dir  = /glade/scratch/worthen/FV3_RT/rt_66446/datm_debug_cfsr
+working dir  = /glade/scratch/heinzell/FV3_RT/rt_17658/datm_debug_cfsr
 Checking test 105 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 285.156024
+The total amount of wall time                        = 285.144005
 
 Test 105 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Thu Mar 18 15:08:27 MDT 2021
-Elapsed time: 01h:48m:46s. Have a nice day!
+Tue Mar 23 11:46:13 MDT 2021
+Elapsed time: 01h:44m:10s. Have a nice day!
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
index 88b99b94a6..a0dea96443 100644
--- a/tests/RegressionTests_gaea.intel.log
+++ b/tests/RegressionTests_gaea.intel.log
@@ -1,9 +1,27 @@
-Thu Mar 18 14:02:42 EDT 2021
+Mon Mar 22 19:31:45 EDT 2021
 Start Regression test
 
+Compile 001 elapsed time 659 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 666 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 003 elapsed time 665 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 004 elapsed time 665 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 005 elapsed time 668 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 006 elapsed time 709 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 007 elapsed time 761 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 008 elapsed time 709 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 009 elapsed time 708 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 010 elapsed time 699 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 011 elapsed time 698 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 012 elapsed time 214 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 013 elapsed time 249 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 014 elapsed time 250 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 015 elapsed time 695 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 016 elapsed time 260 seconds. APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 017 elapsed time 525 seconds. APP=DATM_NEMS
+Compile 018 elapsed time 213 seconds. APP=DATM_NEMS DEBUG=Y
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +86,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.173925
+The total amount of wall time                        = 53.225195
 
 Test 001 fv3_control PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_decomp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +157,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 77.669375
+The total amount of wall time                        = 75.935929
 
 Test 002 fv3_decomp PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_2threads
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +228,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.378820
+The total amount of wall time                        = 57.173784
 
 Test 003 fv3_2threads PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_restart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +281,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.109880
+The total amount of wall time                        = 50.596998
 
 Test 004 fv3_restart PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_read_inc
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +352,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.991447
+The total amount of wall time                        = 70.840529
 
 Test 005 fv3_read_inc PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf_esmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +403,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.327474
+The total amount of wall time                        = 102.378153
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +454,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.565436
+The total amount of wall time                        = 40.642970
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_netcdf_parallel
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -487,13 +505,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.454508
+The total amount of wall time                        = 59.474674
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGlatlon_netcdf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +556,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 40.285961
+The total amount of wall time                        = 43.503530
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_nemsio
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +607,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.056323
+The total amount of wall time                        = 40.957067
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_wrtGauss_nemsio_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +658,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 148.154030
+The total amount of wall time                        = 132.992870
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stochy
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +729,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.992756
+The total amount of wall time                        = 52.544528
 
 Test 012 fv3_stochy PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_ca
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +800,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 85.120918
+The total amount of wall time                        = 58.000807
 
 Test 013 fv3_ca PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_lndp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +871,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 55.435999
+The total amount of wall time                        = 47.989290
 
 Test 014 fv3_lndp PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_iau
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +942,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.747564
+The total amount of wall time                        = 46.163920
 
 Test 015 fv3_iau PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_lheatstrg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +993,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 39.620394
+The total amount of wall time                        = 43.945547
 
 Test 016 fv3_lheatstrg PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_multigases_repro
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_multigases_repro
 Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1070,13 @@ Checking test 017 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 93.531560
+The total amount of wall time                        = 97.564858
 
 Test 017 fv3_multigases PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control_32bit
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_control_32bit
 Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1123,13 +1141,13 @@ Checking test 018 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 74.532582
+The total amount of wall time                        = 69.788288
 
 Test 018 fv3_control_32bit PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_stretched
 Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1182,13 +1200,13 @@ Checking test 019 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 303.026302
+The total amount of wall time                        = 301.800169
 
 Test 019 fv3_stretched PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched_nest
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_stretched_nest
 Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1252,13 +1270,13 @@ Checking test 020 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 333.078656
+The total amount of wall time                        = 367.462041
 
 Test 020 fv3_stretched_nest PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_control
 Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1266,25 +1284,25 @@ Checking test 021 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 672.510765
+The total amount of wall time                        = 675.543808
 
 Test 021 fv3_regional_control PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_restart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_restart
 Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 367.874886
+The total amount of wall time                        = 368.830369
 
 Test 022 fv3_regional_restart PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_quilt
 Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1295,13 +1313,13 @@ Checking test 023 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 693.509027
+The total amount of wall time                        = 693.040273
 
 Test 023 fv3_regional_quilt PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt_hafs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_quilt_hafs
 Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1310,27 +1328,27 @@ Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 688.758619
+The total amount of wall time                        = 693.339867
 
 Test 024 fv3_regional_quilt_hafs PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_quilt_netcdf_parallel
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_quilt_netcdf_parallel
 Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc ............ALT CHECK......OK
- Comparing phyf000.nc .........OK
- Comparing phyf024.nc ............ALT CHECK......OK
+ Comparing dynf024.nc .........OK
+ Comparing phyf000.nc ............ALT CHECK......OK
+ Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 692.256162
+The total amount of wall time                        = 696.050653
 
 Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfdlmp
 Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1375,13 +1393,13 @@ Checking test 026 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.829686
+The total amount of wall time                        = 47.247639
 
 Test 026 fv3_gfdlmp PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_gwd
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfdlmprad_gwd
 Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1426,13 +1444,13 @@ Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 46.787917
+The total amount of wall time                        = 73.433251
 
 Test 027 fv3_gfdlmprad_gwd PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_noahmp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfdlmprad_noahmp
 Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1477,13 +1495,13 @@ Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.856230
+The total amount of wall time                        = 51.640234
 
 Test 028 fv3_gfdlmprad_noahmp PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_csawmg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_csawmg
 Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1528,13 +1546,13 @@ Checking test 029 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 124.446355
+The total amount of wall time                        = 124.913956
 
 Test 029 fv3_csawmg PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_satmedmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_satmedmf
 Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1579,13 +1597,13 @@ Checking test 030 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 81.529699
+The total amount of wall time                        = 55.783295
 
 Test 030 fv3_satmedmf PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_satmedmfq
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_satmedmfq
 Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1630,13 +1648,13 @@ Checking test 031 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.994321
+The total amount of wall time                        = 55.670851
 
 Test 031 fv3_satmedmfq PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmp_32bit
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfdlmp_32bit
 Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1681,13 +1699,13 @@ Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 45.413532
+The total amount of wall time                        = 40.005785
 
 Test 032 fv3_gfdlmp_32bit PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfdlmprad_32bit_post
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfdlmprad_32bit_post
 Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1736,13 +1754,13 @@ Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.161842
+The total amount of wall time                        = 84.731814
 
 Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_cpt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_cpt
 Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1793,13 +1811,13 @@ Checking test 034 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 295.095030
+The total amount of wall time                        = 318.400027
 
 Test 034 fv3_cpt PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gsd
 Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1906,13 @@ Checking test 035 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.933302
+The total amount of wall time                        = 195.270970
 
 Test 035 fv3_gsd PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rap
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_rap
 Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1977,13 @@ Checking test 036 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 94.009529
+The total amount of wall time                        = 97.802874
 
 Test 036 fv3_rap PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_hrrr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_hrrr
 Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2048,13 @@ Checking test 037 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 127.447812
+The total amount of wall time                        = 101.307182
 
 Test 037 fv3_hrrr PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_thompson
 Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2101,13 +2119,13 @@ Checking test 038 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.252587
+The total amount of wall time                        = 93.567935
 
 Test 038 fv3_thompson PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_no_aero
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_thompson_no_aero
 Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2172,13 +2190,13 @@ Checking test 039 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 143.020293
+The total amount of wall time                        = 88.994027
 
 Test 039 fv3_thompson_no_aero PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rrfs_v1beta
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_rrfs_v1beta
 Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2243,13 +2261,13 @@ Checking test 040 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.168042
+The total amount of wall time                        = 108.472896
 
 Test 040 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v15p2
 Checking test 041 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2314,13 +2332,13 @@ Checking test 041 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 129.212450
+The total amount of wall time                        = 106.728293
 
 Test 041 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16
 Checking test 042 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2397,13 +2415,13 @@ Checking test 042 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 116.339200
+The total amount of wall time                        = 121.076566
 
 Test 042 fv3_gfs_v16 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_restart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_restart
 Checking test 043 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2450,13 +2468,13 @@ Checking test 043 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 75.138607
+The total amount of wall time                        = 61.376138
 
 Test 043 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_stochy
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_stochy
 Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2521,13 +2539,13 @@ Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 82.378238
+The total amount of wall time                        = 55.983496
 
 Test 044 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_RRTMGP
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v15p2_RRTMGP
 Checking test 045 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2592,13 +2610,13 @@ Checking test 045 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 175.144328
+The total amount of wall time                        = 177.460026
 
 Test 045 fv3_gfs_v15p2_RRTMGP PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_RRTMGP
 Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2663,13 +2681,13 @@ Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 178.879686
+The total amount of wall time                        = 181.213570
 
 Test 046 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2728,13 +2746,13 @@ Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 720.183361
+The total amount of wall time                        = 724.789646
 
 Test 047 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_2thrd
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2799,13 +2817,13 @@ Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 272.559145
+The total amount of wall time                        = 274.080356
 
 Test 048 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_csawmg
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfsv16_csawmg
 Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2850,13 +2868,13 @@ Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 135.174201
+The total amount of wall time                        = 135.369583
 
 Test 049 fv3_gfsv16_csawmg PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_csawmgt
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfsv16_csawmgt
 Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2901,13 +2919,13 @@ Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.489969
+The total amount of wall time                        = 132.882688
 
 Test 050 fv3_gfsv16_csawmgt PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gocart_clm
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gocart_clm
 Checking test 051 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2952,13 +2970,13 @@ Checking test 051 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.544351
+The total amount of wall time                        = 54.922876
 
 Test 051 fv3_gocart_clm PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_flake
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_flake
 Checking test 052 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3023,13 +3041,13 @@ Checking test 052 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 110.543339
+The total amount of wall time                        = 109.303302
 
 Test 052 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_HAFS_v0_hwrf_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_HAFS_v0_hwrf_thompson
 Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3094,13 +3112,13 @@ Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 161.699485
+The total amount of wall time                        = 167.057868
 
 Test 053 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3115,13 +3133,13 @@ Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 297.153337
+The total amount of wall time                        = 327.903178
 
 Test 054 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfsv16_ugwpv1
 Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3180,13 +3198,13 @@ Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 184.919745
+The total amount of wall time                        = 185.574296
 
 Test 055 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfsv16_ugwpv1_warmstart
 Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3245,13 +3263,13 @@ Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.396511
+The total amount of wall time                        = 186.731894
 
 Test 056 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_ras
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_ras
 Checking test 057 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3316,13 +3334,13 @@ Checking test 057 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 100.193398
+The total amount of wall time                        = 100.736490
 
 Test 057 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v15p2_debug
 Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3387,13 +3405,13 @@ Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 227.452795
+The total amount of wall time                        = 228.248607
 
 Test 058 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_debug
 Checking test 059 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3458,13 +3476,13 @@ Checking test 059 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 169.959918
+The total amount of wall time                        = 171.161098
 
 Test 059 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3529,13 +3547,13 @@ Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 364.400285
+The total amount of wall time                        = 365.856875
 
 Test 060 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_RRTMGP_debug
 Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3600,13 +3618,13 @@ Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 373.305128
+The total amount of wall time                        = 374.839771
 
 Test 061 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_regional_control_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_regional_control_debug
 Checking test 062 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3614,13 +3632,13 @@ Checking test 062 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 366.383020
+The total amount of wall time                        = 370.805224
 
 Test 062 fv3_regional_control_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_control_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_control_debug
 Checking test 063 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3647,13 +3665,13 @@ Checking test 063 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 128.722369
+The total amount of wall time                        = 131.307378
 
 Test 063 fv3_control_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_stretched_nest_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_stretched_nest_debug
 Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3670,13 +3688,13 @@ Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 437.496081
+The total amount of wall time                        = 436.083582
 
 Test 064 fv3_stretched_nest_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gsd_debug
 Checking test 065 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3741,13 +3759,13 @@ Checking test 065 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 196.713598
+The total amount of wall time                        = 199.019429
 
 Test 065 fv3_gsd_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gsd_diag3d_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gsd_diag3d_debug
 Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3812,13 +3830,13 @@ Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 217.697104
+The total amount of wall time                        = 224.513938
 
 Test 066 fv3_gsd_diag3d_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_thompson_debug
 Checking test 067 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3883,13 +3901,13 @@ Checking test 067 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 340.529417
+The total amount of wall time                        = 342.983195
 
 Test 067 fv3_thompson_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_thompson_no_aero_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_thompson_no_aero_debug
 Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3954,13 +3972,13 @@ Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 327.741274
+The total amount of wall time                        = 331.555462
 
 Test 068 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_rrfs_v1beta_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_rrfs_v1beta_debug
 Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4025,13 +4043,13 @@ Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 189.380950
+The total amount of wall time                        = 194.231787
 
 Test 069 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4096,13 +4114,13 @@ Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 205.502659
+The total amount of wall time                        = 207.154542
 
 Test 070 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -4117,13 +4135,13 @@ Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 375.463604
+The total amount of wall time                        = 377.946486
 
 Test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfsv16_ugwpv1_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfsv16_ugwpv1_debug
 Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -4182,13 +4200,13 @@ Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 583.120481
+The total amount of wall time                        = 579.751934
 
 Test 072 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/fv3_gfs_v16_ras_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/fv3_gfs_v16_ras_debug
 Checking test 073 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4253,13 +4271,13 @@ Checking test 073 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 322.960453
+The total amount of wall time                        = 323.082325
 
 Test 073 fv3_gfs_v16_ras_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_control
 Checking test 074 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4309,13 +4327,13 @@ Checking test 074 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 96.066367
+The total amount of wall time                        = 102.328696
 
 Test 074 cpld_control PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restart
 Checking test 075 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4365,13 +4383,13 @@ Checking test 075 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 80.916076
+The total amount of wall time                        = 87.418611
 
 Test 075 cpld_restart PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_controlfrac
 Checking test 076 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4421,13 +4439,13 @@ Checking test 076 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 103.398861
+The total amount of wall time                        = 102.481930
 
 Test 076 cpld_controlfrac PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restartfrac
 Checking test 077 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4477,13 +4495,13 @@ Checking test 077 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 74.393433
+The total amount of wall time                        = 48.798117
 
 Test 077 cpld_restartfrac PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_2threads
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_2threads
 Checking test 078 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4533,13 +4551,13 @@ Checking test 078 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 132.871286
+The total amount of wall time                        = 148.977014
 
 Test 078 cpld_2threads PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_decomp
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_decomp
 Checking test 079 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4589,13 +4607,13 @@ Checking test 079 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 91.193769
+The total amount of wall time                        = 121.811380
 
 Test 079 cpld_decomp PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_satmedmf
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_satmedmf
 Checking test 080 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4645,13 +4663,13 @@ Checking test 080 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 90.195777
+The total amount of wall time                        = 93.958109
 
 Test 080 cpld_satmedmf PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_ca
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_ca
 Checking test 081 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4701,13 +4719,13 @@ Checking test 081 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 109.883565
+The total amount of wall time                        = 90.407515
 
 Test 081 cpld_ca PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_control_c192
 Checking test 082 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4757,13 +4775,13 @@ Checking test 082 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 411.594599
+The total amount of wall time                        = 412.336650
 
 Test 082 cpld_control_c192 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restart_c192
 Checking test 083 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4813,13 +4831,13 @@ Checking test 083 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 287.980100
+The total amount of wall time                        = 279.332122
 
 Test 083 cpld_restart_c192 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_controlfrac_c192
 Checking test 084 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4869,13 +4887,13 @@ Checking test 084 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 412.493013
+The total amount of wall time                        = 413.374264
 
 Test 084 cpld_controlfrac_c192 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac_c192
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restartfrac_c192
 Checking test 085 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4925,13 +4943,13 @@ Checking test 085 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-The total amount of wall time                        = 310.823757
+The total amount of wall time                        = 306.907812
 
 Test 085 cpld_restartfrac_c192 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_control_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_control_c384
 Checking test 086 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4984,13 +5002,13 @@ Checking test 086 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1529.454292
+The total amount of wall time                        = 1552.205444
 
 Test 086 cpld_control_c384 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restart_c384
 Checking test 087 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5043,13 +5061,13 @@ Checking test 087 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 776.811556
+The total amount of wall time                        = 777.917290
 
 Test 087 cpld_restart_c384 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_controlfrac_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_controlfrac_c384
 Checking test 088 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5102,13 +5120,13 @@ Checking test 088 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 1513.024381
+The total amount of wall time                        = 1515.256597
 
 Test 088 cpld_controlfrac_c384 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restartfrac_c384
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restartfrac_c384
 Checking test 089 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5161,13 +5179,13 @@ Checking test 089 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-The total amount of wall time                        = 775.324726
+The total amount of wall time                        = 781.289270
 
 Test 089 cpld_restartfrac_c384 PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_bmark
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_bmark
 Checking test 090 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5220,13 +5238,13 @@ Checking test 090 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 891.937549
+The total amount of wall time                        = 958.000708
 
 Test 090 cpld_bmark PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_bmark
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restart_bmark
 Checking test 091 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5279,13 +5297,13 @@ Checking test 091 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 456.077376
+The total amount of wall time                        = 453.419012
 
 Test 091 cpld_restart_bmark PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_bmarkfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_bmarkfrac
 Checking test 092 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5338,13 +5356,13 @@ Checking test 092 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 877.482866
+The total amount of wall time                        = 942.282580
 
 Test 092 cpld_bmarkfrac PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_restart_bmarkfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_restart_bmarkfrac
 Checking test 093 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5397,13 +5415,13 @@ Checking test 093 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-The total amount of wall time                        = 458.318475
+The total amount of wall time                        = 453.040563
 
 Test 093 cpld_restart_bmarkfrac PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_debug
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_debug
 Checking test 094 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5453,13 +5471,13 @@ Checking test 094 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 264.028391
+The total amount of wall time                        = 262.426117
 
 Test 094 cpld_debug PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/cpld_debugfrac
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/cpld_debugfrac
 Checking test 095 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5509,73 +5527,73 @@ Checking test 095 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-The total amount of wall time                        = 270.464542
+The total amount of wall time                        = 262.383198
 
 Test 095 cpld_debugfrac PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_control_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_control_cfsr
 Checking test 096 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 99.886181
+The total amount of wall time                        = 102.362921
 
 Test 096 datm_control_cfsr PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_restart_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_restart_cfsr
 Checking test 097 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 62.137315
+The total amount of wall time                        = 59.056087
 
 Test 097 datm_restart_cfsr PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_control_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_control_gefs
 Checking test 098 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 95.549332
+The total amount of wall time                        = 96.122095
 
 Test 098 datm_control_gefs PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_bulk_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_bulk_cfsr
 Checking test 099 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 95.883983
+The total amount of wall time                        = 100.572498
 
 Test 099 datm_bulk_cfsr PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_bulk_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_bulk_gefs
 Checking test 100 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 98.449456
+The total amount of wall time                        = 104.806785
 
 Test 100 datm_bulk_gefs PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_mx025_gefs
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_mx025_gefs
 Checking test 101 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -5584,23 +5602,23 @@ Checking test 101 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-The total amount of wall time                        = 448.897550
+The total amount of wall time                        = 404.813727
 
 Test 101 datm_mx025_gefs PASS
 
 
 baseline dir = /lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
-working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_39899/datm_debug_cfsr
+working dir  = /lustre/f2/scratch/Brian.Curtis/FV3_RT/rt_25843/datm_debug_cfsr
 Checking test 102 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-The total amount of wall time                        = 247.861378
+The total amount of wall time                        = 228.906112
 
 Test 102 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Thu Mar 18 15:28:43 EDT 2021
-Elapsed time: 01h:26m:02s. Have a nice day!
+Mon Mar 22 21:33:28 EDT 2021
+Elapsed time: 02h:01m:44s. Have a nice day!
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
index 9136f2f100..fed59af2fa 100644
--- a/tests/RegressionTests_hera.gnu.log
+++ b/tests/RegressionTests_hera.gnu.log
@@ -1,9 +1,19 @@
-Fri Mar 19 16:32:02 UTC 2021
+Mon Mar 22 23:32:14 UTC 2021
 Start Regression test
 
+Compile 001 elapsed time 208 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp
+Compile 002 elapsed time 209 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 003 elapsed time 229 seconds. APP=ATM SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y
+Compile 004 elapsed time 207 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 005 elapsed time 132 seconds. APP=ATM 32BIT=Y DEBUG=Y
+Compile 006 elapsed time 105 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP DEBUG=Y
+Compile 007 elapsed time 231 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
+Compile 008 elapsed time 100 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 009 elapsed time 230 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled
+Compile 010 elapsed time 217 seconds. APP=DATM_NEMS
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfdlmp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfdlmp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfdlmp
 Checking test 001 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -48,13 +58,13 @@ Checking test 001 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 237.471537
+  0: The total amount of wall time                        = 230.266133
 
 Test 001 fv3_gfdlmp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v15p2
 Checking test 002 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -119,13 +129,13 @@ Checking test 002 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 675.469331
+  0: The total amount of wall time                        = 599.039738
 
 Test 002 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16
 Checking test 003 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -202,13 +212,13 @@ Checking test 003 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 644.481194
+  0: The total amount of wall time                        = 615.898198
 
 Test 003 fv3_gfs_v16 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_restart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_restart
 Checking test 004 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -255,13 +265,13 @@ Checking test 004 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 293.565687
+  0: The total amount of wall time                        = 291.894690
 
 Test 004 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_stochy
 Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -326,13 +336,13 @@ Checking test 005 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 403.710703
+  0: The total amount of wall time                        = 358.763115
 
 Test 005 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_flake
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_flake
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_flake
 Checking test 006 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -397,13 +407,13 @@ Checking test 006 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 674.892521
+  0: The total amount of wall time                        = 600.638267
 
 Test 006 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v15p2_RRTMGP
 Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -468,13 +478,13 @@ Checking test 007 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 758.831205
+  0: The total amount of wall time                        = 676.389434
 
 Test 007 fv3_gfs_v15p2_RRTMGP PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_RRTMGP
 Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -539,13 +549,13 @@ Checking test 008 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 764.434046
+  0: The total amount of wall time                        = 669.247663
 
 Test 008 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gsd
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gsd
 Checking test 009 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -634,13 +644,13 @@ Checking test 009 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 846.078479
+  0: The total amount of wall time                        = 812.596497
 
 Test 009 fv3_gsd PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_thompson
 Checking test 010 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -705,13 +715,13 @@ Checking test 010 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 430.229886
+  0: The total amount of wall time                        = 401.362889
 
 Test 010 fv3_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_thompson_no_aero
 Checking test 011 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -776,13 +786,13 @@ Checking test 011 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 387.260332
+  0: The total amount of wall time                        = 399.151230
 
 Test 011 fv3_thompson_no_aero PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_rrfs_v1beta
 Checking test 012 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -847,13 +857,13 @@ Checking test 012 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 443.446092
+  0: The total amount of wall time                        = 411.855119
 
 Test 012 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_HAFS_v0_hwrf_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_HAFS_v0_hwrf_thompson
 Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -918,13 +928,13 @@ Checking test 013 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 640.029604
+  0: The total amount of wall time                        = 624.576443
 
 Test 013 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -939,13 +949,13 @@ Checking test 014 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 450.842489
+ 0: The total amount of wall time                        = 458.898500
 
 Test 014 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfsv16_ugwpv1
 Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1004,13 +1014,13 @@ Checking test 015 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 901.591014
+  0: The total amount of wall time                        = 915.054144
 
 Test 015 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfsv16_ugwpv1_warmstart
 Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1069,13 +1079,13 @@ Checking test 016 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 917.105238
+  0: The total amount of wall time                        = 914.921473
 
 Test 016 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_ras
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_ras
 Checking test 017 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1140,13 +1150,13 @@ Checking test 017 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 574.592917
+  0: The total amount of wall time                        = 565.263089
 
 Test 017 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_control_debug
 Checking test 018 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1173,13 +1183,13 @@ Checking test 018 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 84.997363
+  0: The total amount of wall time                        = 81.813810
 
 Test 018 fv3_control_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_regional_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_regional_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_regional_control_debug
 Checking test 019 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1187,13 +1197,13 @@ Checking test 019 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 172.290542
+ 0: The total amount of wall time                        = 166.326174
 
 Test 019 fv3_regional_control_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_rrfs_v1beta_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_rrfs_v1beta_debug
 Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1258,13 +1268,13 @@ Checking test 020 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 118.870100
+  0: The total amount of wall time                        = 119.092666
 
 Test 020 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gsd_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gsd_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gsd_debug
 Checking test 021 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1329,13 +1339,13 @@ Checking test 021 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 121.813272
+  0: The total amount of wall time                        = 122.752133
 
 Test 021 fv3_gsd_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_thompson_debug
 Checking test 022 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1400,13 +1410,13 @@ Checking test 022 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 200.768902
+  0: The total amount of wall time                        = 201.099441
 
 Test 022 fv3_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_thompson_no_aero_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_thompson_no_aero_debug
 Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1471,13 +1481,13 @@ Checking test 023 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 192.773701
+  0: The total amount of wall time                        = 193.623075
 
 Test 023 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v15p2_debug
 Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1542,13 +1552,13 @@ Checking test 024 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 296.726170
+  0: The total amount of wall time                        = 282.075516
 
 Test 024 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_debug
 Checking test 025 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1613,13 +1623,13 @@ Checking test 025 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 127.074768
+  0: The total amount of wall time                        = 128.813953
 
 Test 025 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1694,13 @@ Checking test 026 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 327.302773
+  0: The total amount of wall time                        = 326.063341
 
 Test 026 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_RRTMGP_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_RRTMGP_debug
 Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1755,13 +1765,13 @@ Checking test 027 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 354.534815
+  0: The total amount of wall time                        = 346.720349
 
 Test 027 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_multigases
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_multigases
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_multigases
 Checking test 028 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1832,13 +1842,13 @@ Checking test 028 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 420.499654
+  0: The total amount of wall time                        = 437.284426
 
 Test 028 fv3_multigases PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1903,13 +1913,13 @@ Checking test 029 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 132.677680
+  0: The total amount of wall time                        = 134.270458
 
 Test 029 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1924,13 +1934,13 @@ Checking test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 227.660754
+ 0: The total amount of wall time                        = 227.874411
 
 Test 030 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfsv16_ugwpv1_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfsv16_ugwpv1_debug
 Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -1989,13 +1999,13 @@ Checking test 031 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 391.564759
+  0: The total amount of wall time                        = 393.520437
 
 Test 031 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/GNU/fv3_gfs_v16_ras_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_148281/fv3_gfs_v16_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_201480/fv3_gfs_v16_ras_debug
 Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2060,11 +2070,11 @@ Checking test 032 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 219.969998
+  0: The total amount of wall time                        = 219.615543
 
 Test 032 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Mar 19 19:23:01 UTC 2021
-Elapsed time: 02h:50m:59s. Have a nice day!
+Mon Mar 22 23:58:26 UTC 2021
+Elapsed time: 00h:26m:12s. Have a nice day!
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
index 664939a3ff..d98bdacc82 100644
--- a/tests/RegressionTests_hera.intel.log
+++ b/tests/RegressionTests_hera.intel.log
@@ -1,9 +1,29 @@
-Fri Mar 19 15:56:08 UTC 2021
+Mon Mar 22 23:46:54 UTC 2021
 Start Regression test
 
+Compile 001 elapsed time 824 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 966 seconds. APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
+Compile 003 elapsed time 794 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 004 elapsed time 538 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 005 elapsed time 575 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 006 elapsed time 516 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 007 elapsed time 699 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 008 elapsed time 588 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 009 elapsed time 573 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 010 elapsed time 515 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 011 elapsed time 505 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 012 elapsed time 533 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 013 elapsed time 169 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 014 elapsed time 217 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 015 elapsed time 290 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 016 elapsed time 560 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 017 elapsed time 608 seconds. APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 018 elapsed time 236 seconds. APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 019 elapsed time 402 seconds. APP=DATM_NEMS
+Compile 020 elapsed time 148 seconds. APP=DATM_NEMS DEBUG=Y
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +88,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 39.366954
+  0: The total amount of wall time                        = 41.030328
 
 Test 001 fv3_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_decomp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +159,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 40.042910
+  0: The total amount of wall time                        = 40.788778
 
 Test 002 fv3_decomp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_2threads
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +230,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 41.787880
+ 0: The total amount of wall time                        = 42.015029
 
 Test 003 fv3_2threads PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_restart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +283,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 19.759936
+  0: The total amount of wall time                        = 19.138450
 
 Test 004 fv3_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_read_inc
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +354,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.350124
+  0: The total amount of wall time                        = 36.320009
 
 Test 005 fv3_read_inc PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf_esmf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +405,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 109.973546
+  0: The total amount of wall time                        = 119.133302
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +456,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 37.412712
+  0: The total amount of wall time                        = 37.286086
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -487,13 +507,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.306747
+  0: The total amount of wall time                        = 51.159720
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGlatlon_netcdf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +558,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.743012
+  0: The total amount of wall time                        = 38.669334
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +609,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.238317
+  0: The total amount of wall time                        = 37.356743
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +660,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 96.443016
+  0: The total amount of wall time                        = 96.705260
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +731,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 41.237996
+  0: The total amount of wall time                        = 40.753609
 
 Test 012 fv3_stochy PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_ca
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +802,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 25.717263
+  0: The total amount of wall time                        = 26.700711
 
 Test 013 fv3_ca PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_lndp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +873,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.449009
+  0: The total amount of wall time                        = 43.608968
 
 Test 014 fv3_lndp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_iau
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +944,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.585567
+  0: The total amount of wall time                        = 35.910157
 
 Test 015 fv3_iau PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_lheatstrg
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +995,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.734224
+  0: The total amount of wall time                        = 36.034232
 
 Test 016 fv3_lheatstrg PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmprad
 Checking test 017 fv3_gfdlmprad results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1027,13 +1047,13 @@ Checking test 017 fv3_gfdlmprad results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 648.749887
+  0: The total amount of wall time                        = 651.522086
 
 Test 017 fv3_gfdlmprad PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_atmwav
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_atmwav
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmprad_atmwav
 Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1079,13 +1099,13 @@ Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 794.961885
+  0: The total amount of wall time                        = 795.771025
 
 Test 018 fv3_gfdlmprad_atmwav PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c768
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_wrtGauss_nemsio_c768
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_wrtGauss_nemsio_c768
 Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1131,13 +1151,13 @@ Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing out_grd.ant_9km .........OK
  Comparing out_grd.aoc_9km .........OK
 
-   0: The total amount of wall time                        = 680.930308
+   0: The total amount of wall time                        = 686.696713
 
 Test 019 fv3_wrtGauss_nemsio_c768 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_multigases_repro
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_multigases_repro
 Checking test 020 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1208,13 +1228,13 @@ Checking test 020 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 94.288968
+  0: The total amount of wall time                        = 94.409498
 
 Test 020 fv3_multigases PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_control_32bit
 Checking test 021 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1279,13 +1299,13 @@ Checking test 021 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 35.895105
+  0: The total amount of wall time                        = 37.293494
 
 Test 021 fv3_control_32bit PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_stretched
 Checking test 022 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1338,13 +1358,13 @@ Checking test 022 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 219.544988
+ 0: The total amount of wall time                        = 224.619141
 
 Test 022 fv3_stretched PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched_nest
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_stretched_nest
 Checking test 023 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1408,13 +1428,13 @@ Checking test 023 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
- 0: The total amount of wall time                        = 241.675102
+ 0: The total amount of wall time                        = 241.143728
 
 Test 023 fv3_stretched_nest PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_control
 Checking test 024 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1422,25 +1442,25 @@ Checking test 024 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 548.190531
+ 0: The total amount of wall time                        = 545.888116
 
 Test 024 fv3_regional_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_restart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_restart
 Checking test 025 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
- 0: The total amount of wall time                        = 302.533953
+ 0: The total amount of wall time                        = 302.592031
 
 Test 025 fv3_regional_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_quilt
 Checking test 026 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1451,13 +1471,13 @@ Checking test 026 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 573.061955
+ 0: The total amount of wall time                        = 571.379197
 
 Test 026 fv3_regional_quilt PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt_hafs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_quilt_hafs
 Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1466,13 +1486,13 @@ Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 572.216512
+ 0: The total amount of wall time                        = 572.107104
 
 Test 027 fv3_regional_quilt_hafs PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_quilt_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_quilt_netcdf_parallel
 Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
@@ -1480,13 +1500,13 @@ Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 576.056927
+ 0: The total amount of wall time                        = 574.912938
 
 Test 028 fv3_regional_quilt_netcdf_parallel PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmp
 Checking test 029 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1531,13 +1551,13 @@ Checking test 029 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.336905
+  0: The total amount of wall time                        = 42.405055
 
 Test 029 fv3_gfdlmp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_gwd
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmprad_gwd
 Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1582,13 +1602,13 @@ Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 42.847183
+  0: The total amount of wall time                        = 42.194658
 
 Test 030 fv3_gfdlmprad_gwd PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_noahmp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmprad_noahmp
 Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1633,13 +1653,13 @@ Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 43.159585
+  0: The total amount of wall time                        = 42.634125
 
 Test 031 fv3_gfdlmprad_noahmp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_csawmg
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_csawmg
 Checking test 032 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1704,13 @@ Checking test 032 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 107.230208
+  0: The total amount of wall time                        = 107.844218
 
 Test 032 fv3_csawmg PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_satmedmf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_satmedmf
 Checking test 033 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1735,13 +1755,13 @@ Checking test 033 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.557898
+  0: The total amount of wall time                        = 45.213413
 
 Test 033 fv3_satmedmf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_satmedmfq
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_satmedmfq
 Checking test 034 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1786,13 +1806,13 @@ Checking test 034 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.282295
+  0: The total amount of wall time                        = 45.173363
 
 Test 034 fv3_satmedmfq PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmp_32bit
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmp_32bit
 Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1837,13 +1857,13 @@ Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 36.633248
+  0: The total amount of wall time                        = 36.570245
 
 Test 035 fv3_gfdlmp_32bit PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfdlmprad_32bit_post
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfdlmprad_32bit_post
 Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1892,13 +1912,13 @@ Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 72.571621
+  0: The total amount of wall time                        = 74.817737
 
 Test 036 fv3_gfdlmprad_32bit_post PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_cpt
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_cpt
 Checking test 037 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1949,13 +1969,13 @@ Checking test 037 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 253.276627
+  0: The total amount of wall time                        = 253.319232
 
 Test 037 fv3_cpt PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gsd
 Checking test 038 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2044,13 +2064,13 @@ Checking test 038 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 177.512813
+  0: The total amount of wall time                        = 177.564346
 
 Test 038 fv3_gsd PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rap
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_rap
 Checking test 039 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2115,13 +2135,13 @@ Checking test 039 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 87.803927
+  0: The total amount of wall time                        = 87.295678
 
 Test 039 fv3_rap PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_hrrr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_hrrr
 Checking test 040 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2186,13 +2206,13 @@ Checking test 040 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 96.256129
+  0: The total amount of wall time                        = 96.088209
 
 Test 040 fv3_hrrr PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_thompson
 Checking test 041 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2257,13 +2277,13 @@ Checking test 041 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 84.610243
+  0: The total amount of wall time                        = 83.657385
 
 Test 041 fv3_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_thompson_no_aero
 Checking test 042 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2328,13 +2348,13 @@ Checking test 042 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 80.016053
+  0: The total amount of wall time                        = 80.112242
 
 Test 042 fv3_thompson_no_aero PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_rrfs_v1beta
 Checking test 043 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2399,13 +2419,13 @@ Checking test 043 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 97.763308
+  0: The total amount of wall time                        = 97.405291
 
 Test 043 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v15p2
 Checking test 044 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2470,13 +2490,13 @@ Checking test 044 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 93.635316
+  0: The total amount of wall time                        = 92.950771
 
 Test 044 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16
 Checking test 045 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2553,13 +2573,13 @@ Checking test 045 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 102.081819
+  0: The total amount of wall time                        = 103.658244
 
 Test 045 fv3_gfs_v16 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_restart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_restart
 Checking test 046 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2606,13 +2626,13 @@ Checking test 046 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 54.023024
+  0: The total amount of wall time                        = 52.932842
 
 Test 046 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_stochy
 Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2677,13 +2697,13 @@ Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.823884
+  0: The total amount of wall time                        = 47.955265
 
 Test 047 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v15p2_RRTMGP
 Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2748,13 +2768,13 @@ Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 155.682140
+  0: The total amount of wall time                        = 155.768039
 
 Test 048 fv3_gfs_v15p2_RRTMGP PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_RRTMGP
 Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2819,13 +2839,13 @@ Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 165.211830
+  0: The total amount of wall time                        = 160.084440
 
 Test 049 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2884,13 +2904,13 @@ Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 621.071081
+  0: The total amount of wall time                        = 624.134358
 
 Test 050 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_2thrd
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2955,13 +2975,13 @@ Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 171.747147
+ 0: The total amount of wall time                        = 174.236436
 
 Test 051 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_csawmg
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfsv16_csawmg
 Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3006,13 +3026,13 @@ Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 114.605300
+  0: The total amount of wall time                        = 114.815562
 
 Test 052 fv3_gfsv16_csawmg PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_csawmgt
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfsv16_csawmgt
 Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3057,13 +3077,13 @@ Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 112.926929
+  0: The total amount of wall time                        = 112.729723
 
 Test 053 fv3_gfsv16_csawmgt PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gocart_clm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gocart_clm
 Checking test 054 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3108,13 +3128,13 @@ Checking test 054 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.699732
+  0: The total amount of wall time                        = 48.822872
 
 Test 054 fv3_gocart_clm PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_flake
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_flake
 Checking test 055 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3179,13 +3199,13 @@ Checking test 055 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 97.267533
+  0: The total amount of wall time                        = 98.159527
 
 Test 055 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_HAFS_v0_hwrf_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_HAFS_v0_hwrf_thompson
 Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3250,13 +3270,13 @@ Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 141.251279
+  0: The total amount of wall time                        = 141.808981
 
 Test 056 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3271,13 +3291,13 @@ Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 279.445435
+ 0: The total amount of wall time                        = 279.286937
 
 Test 057 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfsv16_ugwpv1
 Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3336,13 +3356,13 @@ Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 162.403031
+  0: The total amount of wall time                        = 163.097602
 
 Test 058 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfsv16_ugwpv1_warmstart
 Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3401,13 +3421,13 @@ Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 164.604458
+  0: The total amount of wall time                        = 162.731251
 
 Test 059 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_ras
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_ras
 Checking test 060 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3472,13 +3492,13 @@ Checking test 060 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 87.473920
+  0: The total amount of wall time                        = 88.161439
 
 Test 060 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v15p2_debug
 Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3543,13 +3563,13 @@ Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 225.572325
+  0: The total amount of wall time                        = 227.007305
 
 Test 061 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_debug
 Checking test 062 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3614,13 +3634,13 @@ Checking test 062 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 173.296381
+  0: The total amount of wall time                        = 172.622768
 
 Test 062 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3685,13 +3705,13 @@ Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 348.706433
+  0: The total amount of wall time                        = 349.388826
 
 Test 063 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_RRTMGP_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_RRTMGP_debug
 Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3756,13 +3776,13 @@ Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 347.673806
+  0: The total amount of wall time                        = 352.212254
 
 Test 064 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_regional_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_regional_control_debug
 Checking test 065 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3770,13 +3790,13 @@ Checking test 065 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 353.505385
+ 0: The total amount of wall time                        = 347.942146
 
 Test 065 fv3_regional_control_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_control_debug
 Checking test 066 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3803,13 +3823,13 @@ Checking test 066 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 132.647365
+  0: The total amount of wall time                        = 130.840777
 
 Test 066 fv3_control_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_stretched_nest_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_stretched_nest_debug
 Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3826,13 +3846,13 @@ Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 352.899196
+ 0: The total amount of wall time                        = 351.036123
 
 Test 067 fv3_stretched_nest_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gsd_debug
 Checking test 068 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3897,13 +3917,13 @@ Checking test 068 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 197.568431
+  0: The total amount of wall time                        = 195.786741
 
 Test 068 fv3_gsd_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gsd_diag3d_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gsd_diag3d_debug
 Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3968,13 +3988,13 @@ Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 250.595468
+  0: The total amount of wall time                        = 255.528227
 
 Test 069 fv3_gsd_diag3d_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_thompson_debug
 Checking test 070 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4039,13 +4059,13 @@ Checking test 070 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 333.573337
+  0: The total amount of wall time                        = 327.548315
 
 Test 070 fv3_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_thompson_no_aero_debug
 Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4110,13 +4130,13 @@ Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 317.647750
+  0: The total amount of wall time                        = 322.229219
 
 Test 071 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_rrfs_v1beta_debug
 Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4181,13 +4201,13 @@ Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 192.390696
+  0: The total amount of wall time                        = 191.080651
 
 Test 072 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4252,13 +4272,13 @@ Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 203.404709
+  0: The total amount of wall time                        = 201.966598
 
 Test 073 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -4273,13 +4293,13 @@ Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 380.261543
+ 0: The total amount of wall time                        = 387.174978
 
 Test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfsv16_ugwpv1_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfsv16_ugwpv1_debug
 Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -4338,13 +4358,13 @@ Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 542.538902
+  0: The total amount of wall time                        = 548.665426
 
 Test 075 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/fv3_gfs_v16_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/fv3_gfs_v16_ras_debug
 Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4409,13 +4429,13 @@ Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 320.026427
+  0: The total amount of wall time                        = 308.110126
 
 Test 076 fv3_gfs_v16_ras_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_control
 Checking test 077 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4465,13 +4485,13 @@ Checking test 077 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 89.492388
+  0: The total amount of wall time                        = 91.160881
 
 Test 077 cpld_control PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart
 Checking test 078 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4521,13 +4541,13 @@ Checking test 078 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 52.752001
+  0: The total amount of wall time                        = 53.505299
 
 Test 078 cpld_restart PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_controlfrac
 Checking test 079 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4577,13 +4597,13 @@ Checking test 079 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 89.156218
+  0: The total amount of wall time                        = 92.818979
 
 Test 079 cpld_controlfrac PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restartfrac
 Checking test 080 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4633,13 +4653,13 @@ Checking test 080 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 54.839990
+  0: The total amount of wall time                        = 54.188205
 
 Test 080 cpld_restartfrac PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_2threads
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_2threads
 Checking test 081 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4689,13 +4709,13 @@ Checking test 081 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 109.331295
+  0: The total amount of wall time                        = 109.846490
 
 Test 081 cpld_2threads PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_decomp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_decomp
 Checking test 082 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4745,13 +4765,13 @@ Checking test 082 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 86.886875
+  0: The total amount of wall time                        = 88.891960
 
 Test 082 cpld_decomp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_satmedmf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_satmedmf
 Checking test 083 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4801,13 +4821,13 @@ Checking test 083 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 86.736219
+  0: The total amount of wall time                        = 88.584800
 
 Test 083 cpld_satmedmf PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_ca
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_ca
 Checking test 084 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4857,13 +4877,13 @@ Checking test 084 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 86.330204
+  0: The total amount of wall time                        = 88.504438
 
 Test 084 cpld_ca PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_control_c192
 Checking test 085 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4913,13 +4933,13 @@ Checking test 085 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 375.102929
+  0: The total amount of wall time                        = 377.874915
 
 Test 085 cpld_control_c192 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart_c192
 Checking test 086 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4969,13 +4989,13 @@ Checking test 086 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 271.849544
+  0: The total amount of wall time                        = 265.979803
 
 Test 086 cpld_restart_c192 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_controlfrac_c192
 Checking test 087 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5025,13 +5045,13 @@ Checking test 087 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 376.076936
+  0: The total amount of wall time                        = 374.411148
 
 Test 087 cpld_controlfrac_c192 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restartfrac_c192
 Checking test 088 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5081,13 +5101,13 @@ Checking test 088 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 261.680954
+  0: The total amount of wall time                        = 261.415897
 
 Test 088 cpld_restartfrac_c192 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_c384
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_control_c384
 Checking test 089 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5140,13 +5160,13 @@ Checking test 089 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1310.415571
+  0: The total amount of wall time                        = 1317.485100
 
 Test 089 cpld_control_c384 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_c384
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart_c384
 Checking test 090 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5199,13 +5219,13 @@ Checking test 090 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 699.923037
+  0: The total amount of wall time                        = 689.823982
 
 Test 090 cpld_restart_c384 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_controlfrac_c384
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_controlfrac_c384
 Checking test 091 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5258,13 +5278,13 @@ Checking test 091 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1312.460118
+  0: The total amount of wall time                        = 1303.957096
 
 Test 091 cpld_controlfrac_c384 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restartfrac_c384
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restartfrac_c384
 Checking test 092 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5317,13 +5337,13 @@ Checking test 092 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 694.840528
+  0: The total amount of wall time                        = 682.402036
 
 Test 092 cpld_restartfrac_c384 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmark
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmark
 Checking test 093 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5376,13 +5396,13 @@ Checking test 093 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 797.868408
+  0: The total amount of wall time                        = 820.589829
 
 Test 093 cpld_bmark PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmark
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart_bmark
 Checking test 094 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5435,13 +5455,13 @@ Checking test 094 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 456.416099
+  0: The total amount of wall time                        = 441.981540
 
 Test 094 cpld_restart_bmark PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmarkfrac
 Checking test 095 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5494,13 +5514,13 @@ Checking test 095 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 786.716243
+  0: The total amount of wall time                        = 809.816461
 
 Test 095 cpld_bmarkfrac PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmarkfrac
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart_bmarkfrac
 Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5553,13 +5573,13 @@ Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 446.217410
+  0: The total amount of wall time                        = 441.646627
 
 Test 096 cpld_restart_bmarkfrac PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmarkfrac_v16
 Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5612,13 +5632,13 @@ Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 1306.615833
+  0: The total amount of wall time                        = 1315.649066
 
 Test 097 cpld_bmarkfrac_v16 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_restart_bmarkfrac_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_restart_bmarkfrac_v16
 Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5671,13 +5691,13 @@ Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 720.890251
+  0: The total amount of wall time                        = 716.016695
 
 Test 098 cpld_restart_bmarkfrac_v16 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmark_wave
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmark_wave
 Checking test 099 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5733,13 +5753,13 @@ Checking test 099 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1342.795970
+  0: The total amount of wall time                        = 1382.696571
 
 Test 099 cpld_bmark_wave PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_wave
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmarkfrac_wave
 Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5795,13 +5815,13 @@ Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1352.035957
+  0: The total amount of wall time                        = 1368.527549
 
 Test 100 cpld_bmarkfrac_wave PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_bmarkfrac_wave_v16
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_bmarkfrac_wave_v16
 Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5856,13 +5876,13 @@ Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 881.385353
+  0: The total amount of wall time                        = 891.093208
 
 Test 101 cpld_bmarkfrac_wave_v16 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_control_wave
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_control_wave
 Checking test 102 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5915,13 +5935,13 @@ Checking test 102 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 779.555195
+  0: The total amount of wall time                        = 783.029630
 
 Test 102 cpld_control_wave PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_debug
 Checking test 103 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5971,13 +5991,13 @@ Checking test 103 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 285.915942
+  0: The total amount of wall time                        = 285.421588
 
 Test 103 cpld_debug PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/cpld_debugfrac
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/cpld_debugfrac
 Checking test 104 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -6027,73 +6047,73 @@ Checking test 104 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 284.565844
+  0: The total amount of wall time                        = 281.936341
 
 Test 104 cpld_debugfrac PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_control_cfsr
 Checking test 105 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 95.410816
+  0: The total amount of wall time                        = 97.924781
 
 Test 105 datm_control_cfsr PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_restart_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_restart_cfsr
 Checking test 106 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 60.909505
+  0: The total amount of wall time                        = 63.390943
 
 Test 106 datm_restart_cfsr PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_control_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_control_gefs
 Checking test 107 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 88.722502
+  0: The total amount of wall time                        = 90.525353
 
 Test 107 datm_control_gefs PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_bulk_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_bulk_cfsr
 Checking test 108 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 91.873665
+  0: The total amount of wall time                        = 94.753543
 
 Test 108 datm_bulk_cfsr PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_bulk_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_bulk_gefs
 Checking test 109 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 88.616042
+  0: The total amount of wall time                        = 90.559121
 
 Test 109 datm_bulk_gefs PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_mx025_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_mx025_cfsr
 Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6102,13 +6122,13 @@ Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 357.635167
+  0: The total amount of wall time                        = 363.841625
 
 Test 110 datm_mx025_cfsr PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_mx025_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_mx025_gefs
 Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6117,23 +6137,23 @@ Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 345.475405
+  0: The total amount of wall time                        = 349.344429
 
 Test 111 datm_mx025_gefs PASS
 
 
 baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
-working dir  = /scratch2/BMC/gsienkf/Philip.Pegion/stmp2/Philip.Pegion/FV3_RT/rt_59288/datm_debug_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_279140/datm_debug_cfsr
 Checking test 112 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 266.026575
+  0: The total amount of wall time                        = 269.316066
 
 Test 112 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Mar 19 19:01:44 UTC 2021
-Elapsed time: 03h:05m:37s. Have a nice day!
+Tue Mar 23 01:13:29 UTC 2021
+Elapsed time: 01h:26m:35s. Have a nice day!
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
index 85fbe99614..390cfb3f75 100644
--- a/tests/RegressionTests_jet.intel.log
+++ b/tests/RegressionTests_jet.intel.log
@@ -1,9 +1,23 @@
-Fri Mar 19 20:32:46 GMT 2021
+Mon Mar 22 23:31:27 GMT 2021
 Start Regression test
 
+Compile 001 elapsed time 3225 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 1177 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 003 elapsed time 2040 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 004 elapsed time 2052 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 005 elapsed time 2078 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 006 elapsed time 2601 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 007 elapsed time 2476 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 008 elapsed time 2255 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 009 elapsed time 2186 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 010 elapsed time 2083 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 011 elapsed time 2293 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 012 elapsed time 219 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 013 elapsed time 230 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 014 elapsed time 211 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +82,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 64.728782
+The total amount of wall time                        = 63.457498
 
 Test 001 fv3_control PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_2threads
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_2threads
 Checking test 002 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +153,13 @@ Checking test 002 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 247.935928
+The total amount of wall time                        = 286.959426
 
 Test 002 fv3_2threads PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_restart
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_restart
 Checking test 003 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -192,13 +206,13 @@ Checking test 003 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 28.060533
+The total amount of wall time                        = 28.010051
 
 Test 003 fv3_restart PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_read_inc
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_read_inc
 Checking test 004 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -263,13 +277,13 @@ Checking test 004 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.163985
+The total amount of wall time                        = 53.034675
 
 Test 004 fv3_read_inc PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf_esmf
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGauss_netcdf_esmf
 Checking test 005 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -314,13 +328,13 @@ Checking test 005 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 188.134730
+The total amount of wall time                        = 155.728536
 
 Test 005 fv3_wrtGauss_netcdf_esmf PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGauss_netcdf
 Checking test 006 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -365,13 +379,13 @@ Checking test 006 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.163288
+The total amount of wall time                        = 53.058650
 
 Test 006 fv3_wrtGauss_netcdf PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGauss_netcdf_parallel
 Checking test 007 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -416,13 +430,13 @@ Checking test 007 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 73.607947
+The total amount of wall time                        = 67.698088
 
 Test 007 fv3_wrtGauss_netcdf_parallel PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGlatlon_netcdf
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGlatlon_netcdf
 Checking test 008 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -467,13 +481,13 @@ Checking test 008 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.930898
+The total amount of wall time                        = 53.516661
 
 Test 008 fv3_wrtGlatlon_netcdf PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_nemsio
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGauss_nemsio
 Checking test 009 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -518,13 +532,13 @@ Checking test 009 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.238510
+The total amount of wall time                        = 52.530401
 
 Test 009 fv3_wrtGauss_nemsio PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_wrtGauss_nemsio_c192
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_wrtGauss_nemsio_c192
 Checking test 010 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -569,13 +583,13 @@ Checking test 010 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 140.933841
+The total amount of wall time                        = 140.918517
 
 Test 010 fv3_wrtGauss_nemsio_c192 PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_stochy
 Checking test 011 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +654,13 @@ Checking test 011 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.037783
+The total amount of wall time                        = 58.535293
 
 Test 011 fv3_stochy PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_ca
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_ca
 Checking test 012 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +725,13 @@ Checking test 012 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 43.965197
+The total amount of wall time                        = 43.192538
 
 Test 012 fv3_ca PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_lndp
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_lndp
 Checking test 013 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +796,13 @@ Checking test 013 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 67.359845
+The total amount of wall time                        = 64.112856
 
 Test 013 fv3_lndp PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_iau
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_iau
 Checking test 014 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +867,13 @@ Checking test 014 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.393139
+The total amount of wall time                        = 52.773235
 
 Test 014 fv3_iau PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_lheatstrg
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_lheatstrg
 Checking test 015 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -904,13 +918,13 @@ Checking test 015 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 53.119680
+The total amount of wall time                        = 52.165470
 
 Test 015 fv3_lheatstrg PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_multigases_repro
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_multigases_repro
 Checking test 016 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -981,13 +995,13 @@ Checking test 016 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 129.411586
+The total amount of wall time                        = 129.437864
 
 Test 016 fv3_multigases PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_control_32bit
 Checking test 017 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1052,13 +1066,13 @@ Checking test 017 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.787940
+The total amount of wall time                        = 55.128539
 
 Test 017 fv3_control_32bit PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_stretched
 Checking test 018 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1111,13 +1125,13 @@ Checking test 018 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 397.670535
+The total amount of wall time                        = 395.212291
 
 Test 018 fv3_stretched PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched_nest
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_stretched_nest
 Checking test 019 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1181,13 +1195,13 @@ Checking test 019 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 425.730764
+The total amount of wall time                        = 425.768103
 
 Test 019 fv3_stretched_nest PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_control
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_control
 Checking test 020 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1195,25 +1209,25 @@ Checking test 020 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 865.261803
+The total amount of wall time                        = 862.438264
 
 Test 020 fv3_regional_control PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_restart
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_restart
 Checking test 021 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 480.835251
+The total amount of wall time                        = 482.687176
 
 Test 021 fv3_regional_restart PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_quilt
 Checking test 022 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1224,13 +1238,13 @@ Checking test 022 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 846.432121
+The total amount of wall time                        = 843.703210
 
 Test 022 fv3_regional_quilt PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt_hafs
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_quilt_hafs
 Checking test 023 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1239,13 +1253,13 @@ Checking test 023 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 843.338808
+The total amount of wall time                        = 849.096346
 
 Test 023 fv3_regional_quilt_hafs PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_quilt_netcdf_parallel
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_quilt_netcdf_parallel
 Checking test 024 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
@@ -1253,13 +1267,13 @@ Checking test 024 fv3_regional_quilt_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 845.687904
+The total amount of wall time                        = 846.773020
 
 Test 024 fv3_regional_quilt_netcdf_parallel PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmp
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfdlmp
 Checking test 025 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1304,13 +1318,13 @@ Checking test 025 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 61.442180
+The total amount of wall time                        = 60.602688
 
 Test 025 fv3_gfdlmp PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_gwd
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfdlmprad_gwd
 Checking test 026 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1355,13 +1369,13 @@ Checking test 026 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.994258
+The total amount of wall time                        = 60.719972
 
 Test 026 fv3_gfdlmprad_gwd PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_noahmp
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfdlmprad_noahmp
 Checking test 027 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1406,13 +1420,13 @@ Checking test 027 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 61.299577
+The total amount of wall time                        = 60.836103
 
 Test 027 fv3_gfdlmprad_noahmp PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_csawmg
 Checking test 028 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1457,13 +1471,13 @@ Checking test 028 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 151.835768
+The total amount of wall time                        = 150.291266
 
 Test 028 fv3_csawmg PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_satmedmf
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_satmedmf
 Checking test 029 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1508,13 +1522,13 @@ Checking test 029 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.891762
+The total amount of wall time                        = 66.779379
 
 Test 029 fv3_satmedmf PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_satmedmfq
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_satmedmfq
 Checking test 030 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1559,13 +1573,13 @@ Checking test 030 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 64.924674
+The total amount of wall time                        = 65.432115
 
 Test 030 fv3_satmedmfq PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmp_32bit
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfdlmp_32bit
 Checking test 031 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1610,13 +1624,13 @@ Checking test 031 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 52.801592
+The total amount of wall time                        = 53.211388
 
 Test 031 fv3_gfdlmp_32bit PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfdlmprad_32bit_post
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfdlmprad_32bit_post
 Checking test 032 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1665,13 +1679,13 @@ Checking test 032 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 96.194080
+The total amount of wall time                        = 95.386979
 
 Test 032 fv3_gfdlmprad_32bit_post PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_cpt
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_cpt
 Checking test 033 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1722,13 +1736,13 @@ Checking test 033 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 348.882981
+The total amount of wall time                        = 348.795415
 
 Test 033 fv3_cpt PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gsd
 Checking test 034 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1817,13 +1831,13 @@ Checking test 034 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 240.816257
+The total amount of wall time                        = 244.664044
 
 Test 034 fv3_gsd PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_thompson
 Checking test 035 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1888,13 +1902,13 @@ Checking test 035 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 114.204287
+The total amount of wall time                        = 113.992952
 
 Test 035 fv3_thompson PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_no_aero
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_thompson_no_aero
 Checking test 036 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1959,13 +1973,13 @@ Checking test 036 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.542404
+The total amount of wall time                        = 107.419023
 
 Test 036 fv3_thompson_no_aero PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v15p2
 Checking test 037 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2030,13 +2044,13 @@ Checking test 037 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 118.426819
+The total amount of wall time                        = 119.860968
 
 Test 037 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16
 Checking test 038 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2113,13 +2127,13 @@ Checking test 038 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 145.923377
+The total amount of wall time                        = 145.620340
 
 Test 038 fv3_gfs_v16 PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_restart
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_restart
 Checking test 039 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2166,13 +2180,13 @@ Checking test 039 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 74.629030
+The total amount of wall time                        = 75.006198
 
 Test 039 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_stochy
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_stochy
 Checking test 040 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2237,13 +2251,13 @@ Checking test 040 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.585332
+The total amount of wall time                        = 66.798086
 
 Test 040 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_RRTMGP
 Checking test 041 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2308,13 +2322,13 @@ Checking test 041 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 202.330587
+The total amount of wall time                        = 192.208742
 
 Test 041 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 042 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2373,13 +2387,13 @@ Checking test 042 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 803.832167
+The total amount of wall time                        = 804.367251
 
 Test 042 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_2thrd
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 043 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2444,13 +2458,13 @@ Checking test 043 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 827.003276
+The total amount of wall time                        = 806.425917
 
 Test 043 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_csawmg
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfsv16_csawmg
 Checking test 044 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2495,13 +2509,13 @@ Checking test 044 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 162.444195
+The total amount of wall time                        = 161.862794
 
 Test 044 fv3_gfsv16_csawmg PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_csawmgt
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfsv16_csawmgt
 Checking test 045 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2546,13 +2560,13 @@ Checking test 045 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 160.087092
+The total amount of wall time                        = 160.459083
 
 Test 045 fv3_gfsv16_csawmgt PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gocart_clm
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gocart_clm
 Checking test 046 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2597,13 +2611,13 @@ Checking test 046 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 70.082356
+The total amount of wall time                        = 67.712083
 
 Test 046 fv3_gocart_clm PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_flake
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_flake
 Checking test 047 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2668,13 +2682,13 @@ Checking test 047 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.487427
+The total amount of wall time                        = 122.945789
 
 Test 047 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_HAFS_v0_hwrf_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_HAFS_v0_hwrf_thompson
 Checking test 048 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2739,13 +2753,13 @@ Checking test 048 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 192.169109
+The total amount of wall time                        = 191.517763
 
 Test 048 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 049 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -2760,13 +2774,13 @@ Checking test 049 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 356.676973
+The total amount of wall time                        = 357.299887
 
 Test 049 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfsv16_ugwpv1
 Checking test 050 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2825,13 +2839,13 @@ Checking test 050 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 229.423421
+The total amount of wall time                        = 229.338431
 
 Test 050 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfsv16_ugwpv1_warmstart
 Checking test 051 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2890,13 +2904,13 @@ Checking test 051 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 229.322248
+The total amount of wall time                        = 228.134745
 
 Test 051 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_ras
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_ras
 Checking test 052 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2961,13 +2975,13 @@ Checking test 052 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 123.968164
+The total amount of wall time                        = 122.757670
 
 Test 052 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v15p2_debug
 Checking test 053 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3032,13 +3046,13 @@ Checking test 053 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 273.697286
+The total amount of wall time                        = 273.041754
 
 Test 053 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_debug
 Checking test 054 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3103,13 +3117,13 @@ Checking test 054 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 208.127790
+The total amount of wall time                        = 207.147070
 
 Test 054 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 055 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3174,13 +3188,13 @@ Checking test 055 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 440.089160
+The total amount of wall time                        = 440.676073
 
 Test 055 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_RRTMGP_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_RRTMGP_debug
 Checking test 056 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3245,13 +3259,13 @@ Checking test 056 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 451.065134
+The total amount of wall time                        = 454.031668
 
 Test 056 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_regional_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_regional_control_debug
 Checking test 057 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3259,13 +3273,13 @@ Checking test 057 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 458.313491
+The total amount of wall time                        = 455.214080
 
 Test 057 fv3_regional_control_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_control_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_control_debug
 Checking test 058 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3292,13 +3306,13 @@ Checking test 058 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 158.968260
+The total amount of wall time                        = 160.145813
 
 Test 058 fv3_control_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_stretched_nest_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_stretched_nest_debug
 Checking test 059 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3315,13 +3329,13 @@ Checking test 059 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 535.750789
+The total amount of wall time                        = 535.120230
 
 Test 059 fv3_stretched_nest_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gsd_debug
 Checking test 060 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3386,13 +3400,13 @@ Checking test 060 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 239.269686
+The total amount of wall time                        = 240.946924
 
 Test 060 fv3_gsd_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gsd_diag3d_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gsd_diag3d_debug
 Checking test 061 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3457,13 +3471,13 @@ Checking test 061 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 271.115849
+The total amount of wall time                        = 269.074205
 
 Test 061 fv3_gsd_diag3d_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_thompson_debug
 Checking test 062 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3528,13 +3542,13 @@ Checking test 062 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 417.427067
+The total amount of wall time                        = 417.046468
 
 Test 062 fv3_thompson_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_thompson_no_aero_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_thompson_no_aero_debug
 Checking test 063 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3599,13 +3613,13 @@ Checking test 063 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 401.368140
+The total amount of wall time                        = 403.581965
 
 Test 063 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_rrfs_v1beta_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_rrfs_v1beta_debug
 Checking test 064 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3670,13 +3684,13 @@ Checking test 064 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 231.962234
+The total amount of wall time                        = 230.865834
 
 Test 064 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 065 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3741,13 +3755,13 @@ Checking test 065 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 247.594030
+The total amount of wall time                        = 248.012531
 
 Test 065 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 066 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3762,13 +3776,13 @@ Checking test 066 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 464.549115
+The total amount of wall time                        = 464.074253
 
 Test 066 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfsv16_ugwpv1_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfsv16_ugwpv1_debug
 Checking test 067 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3827,13 +3841,13 @@ Checking test 067 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 709.309574
+The total amount of wall time                        = 709.823754
 
 Test 067 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /lfs4/HFIP/hfv3gfs/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /lfs4/HFIP/hfv3gfs/Dusan.Jovic/RT_RUNDIRS/Dusan.Jovic/FV3_RT/rt_101763/fv3_gfs_v16_ras_debug
+working dir  = /lfs4/HFIP/hfv3gfs/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_67925/fv3_gfs_v16_ras_debug
 Checking test 068 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3898,11 +3912,11 @@ Checking test 068 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 395.013982
+The total amount of wall time                        = 395.042769
 
 Test 068 fv3_gfs_v16_ras_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Mar 19 23:14:51 GMT 2021
-Elapsed time: 02h:42m:05s. Have a nice day!
+Tue Mar 23 02:45:23 GMT 2021
+Elapsed time: 03h:13m:56s. Have a nice day!
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
index bd8bb38e30..87f9342763 100644
--- a/tests/RegressionTests_orion.intel.log
+++ b/tests/RegressionTests_orion.intel.log
@@ -1,9 +1,29 @@
-Fri Mar 19 12:50:33 CDT 2021
+Tue Mar 23 07:53:29 CDT 2021
 Start Regression test
 
+Compile 001 elapsed time 494 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 573 seconds. APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
+Compile 003 elapsed time 534 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 004 elapsed time 490 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 005 elapsed time 494 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 006 elapsed time 564 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 007 elapsed time 667 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 008 elapsed time 736 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 009 elapsed time 663 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 010 elapsed time 540 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 011 elapsed time 508 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 012 elapsed time 551 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 013 elapsed time 145 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 014 elapsed time 143 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 015 elapsed time 134 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+Compile 016 elapsed time 740 seconds. APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 017 elapsed time 564 seconds. APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 018 elapsed time 152 seconds. APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled
+Compile 019 elapsed time 380 seconds. APP=DATM_NEMS
+Compile 020 elapsed time 128 seconds. APP=DATM_NEMS DEBUG=Y
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_control
 Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -68,13 +88,13 @@ Checking test 001 fv3_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.822248
+  0: The total amount of wall time                        = 46.101687
 
 Test 001 fv3_control PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_decomp
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_decomp
 Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -139,13 +159,13 @@ Checking test 002 fv3_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 51.521173
+  0: The total amount of wall time                        = 50.718015
 
 Test 002 fv3_decomp PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_2threads
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_2threads
 Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -210,13 +230,13 @@ Checking test 003 fv3_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 45.713742
+ 0: The total amount of wall time                        = 44.711798
 
 Test 003 fv3_2threads PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_restart
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_restart
 Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -263,13 +283,13 @@ Checking test 004 fv3_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 28.132500
+  0: The total amount of wall time                        = 23.482743
 
 Test 004 fv3_restart PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_read_inc
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_read_inc
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_read_inc
 Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -334,13 +354,13 @@ Checking test 005 fv3_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 44.505180
+  0: The total amount of wall time                        = 49.553305
 
 Test 005 fv3_read_inc PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_esmf
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf_esmf
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_netcdf_esmf
 Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -385,13 +405,13 @@ Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 166.407823
+  0: The total amount of wall time                        = 162.108596
 
 Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_netcdf
 Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -436,13 +456,13 @@ Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 40.838167
+  0: The total amount of wall time                        = 47.991036
 
 Test 007 fv3_wrtGauss_netcdf PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_netcdf_parallel
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_netcdf_parallel
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_netcdf_parallel
 Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -453,7 +473,7 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing dynf024.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -487,13 +507,13 @@ Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 62.405697
+  0: The total amount of wall time                        = 58.224379
 
 Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGlatlon_netcdf
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGlatlon_netcdf
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGlatlon_netcdf
 Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -538,13 +558,13 @@ Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.179670
+  0: The total amount of wall time                        = 45.794276
 
 Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_nemsio
 Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -589,13 +609,13 @@ Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 45.659848
+  0: The total amount of wall time                        = 39.920793
 
 Test 010 fv3_wrtGauss_nemsio PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c192
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio_c192
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_nemsio_c192
 Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -640,13 +660,13 @@ Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 109.415050
+  0: The total amount of wall time                        = 107.928106
 
 Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stochy
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stochy
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_stochy
 Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -711,13 +731,13 @@ Checking test 012 fv3_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 44.225112
+  0: The total amount of wall time                        = 50.234873
 
 Test 012 fv3_stochy PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_ca
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_ca
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_ca
 Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -782,13 +802,13 @@ Checking test 013 fv3_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 30.103813
+  0: The total amount of wall time                        = 35.593690
 
 Test 013 fv3_ca PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lndp
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_lndp
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_lndp
 Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -853,13 +873,13 @@ Checking test 014 fv3_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 56.130941
+  0: The total amount of wall time                        = 58.322300
 
 Test 014 fv3_lndp PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_iau
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_iau
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_iau
 Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -924,13 +944,13 @@ Checking test 015 fv3_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 50.465295
+  0: The total amount of wall time                        = 43.056711
 
 Test 015 fv3_iau PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_lheatstrg
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_lheatstrg
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_lheatstrg
 Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -975,13 +995,13 @@ Checking test 016 fv3_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 46.489782
+  0: The total amount of wall time                        = 47.053957
 
 Test 016 fv3_lheatstrg PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmprad
 Checking test 017 fv3_gfdlmprad results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1027,13 +1047,13 @@ Checking test 017 fv3_gfdlmprad results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 678.419956
+  0: The total amount of wall time                        = 677.826819
 
 Test 017 fv3_gfdlmprad PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_atmwav
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_atmwav
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmprad_atmwav
 Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1079,13 +1099,13 @@ Checking test 018 fv3_gfdlmprad_atmwav results ....
  Comparing RESTART/phy_data.tile6.nc .........OK
  Comparing out_grd.glo_30m .........OK
 
-  0: The total amount of wall time                        = 826.633003
+  0: The total amount of wall time                        = 819.282807
 
 Test 018 fv3_gfdlmprad_atmwav PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_wrtGauss_nemsio_c768
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_wrtGauss_nemsio_c768
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_wrtGauss_nemsio_c768
 Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1131,13 +1151,13 @@ Checking test 019 fv3_wrtGauss_nemsio_c768 results ....
  Comparing out_grd.ant_9km .........OK
  Comparing out_grd.aoc_9km .........OK
 
-   0: The total amount of wall time                        = 706.467872
+   0: The total amount of wall time                        = 696.965587
 
 Test 019 fv3_wrtGauss_nemsio_c768 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_multigases_repro
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_multigases_repro
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_multigases_repro
 Checking test 020 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1208,13 +1228,13 @@ Checking test 020 fv3_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 107.230897
+  0: The total amount of wall time                        = 105.512769
 
 Test 020 fv3_multigases PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_32bit
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control_32bit
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_control_32bit
 Checking test 021 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1279,13 +1299,13 @@ Checking test 021 fv3_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 47.582102
+  0: The total amount of wall time                        = 38.127887
 
 Test 021 fv3_control_32bit PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_stretched
 Checking test 022 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1338,13 +1358,13 @@ Checking test 022 fv3_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 217.262541
+ 0: The total amount of wall time                        = 217.119629
 
 Test 022 fv3_stretched PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched_nest
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_stretched_nest
 Checking test 023 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1408,13 +1428,13 @@ Checking test 023 fv3_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
- 0: The total amount of wall time                        = 243.162287
+ 0: The total amount of wall time                        = 243.635806
 
 Test 023 fv3_stretched_nest PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_control
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_control
 Checking test 024 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -1422,25 +1442,25 @@ Checking test 024 fv3_regional_control results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 536.273022
+ 0: The total amount of wall time                        = 534.231915
 
 Test 024 fv3_regional_control PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_restart
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_restart
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_restart
 Checking test 025 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
- 0: The total amount of wall time                        = 301.035378
+ 0: The total amount of wall time                        = 297.626999
 
 Test 025 fv3_regional_restart PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_quilt
 Checking test 026 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1451,13 +1471,13 @@ Checking test 026 fv3_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 576.311724
+ 0: The total amount of wall time                        = 579.524629
 
 Test 026 fv3_regional_quilt PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_hafs
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt_hafs
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_quilt_hafs
 Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -1466,27 +1486,27 @@ Checking test 027 fv3_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 580.253857
+ 0: The total amount of wall time                        = 579.955266
 
 Test 027 fv3_regional_quilt_hafs PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_quilt_netcdf_parallel
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_quilt_netcdf_parallel
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_quilt_netcdf_parallel
 Checking test 028 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
- Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 577.972230
+ 0: The total amount of wall time                        = 581.995280
 
 Test 028 fv3_regional_quilt_netcdf_parallel PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmp
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmp
 Checking test 029 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1531,13 +1551,13 @@ Checking test 029 fv3_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.088020
+  0: The total amount of wall time                        = 50.451199
 
 Test 029 fv3_gfdlmp PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_gwd
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_gwd
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmprad_gwd
 Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1582,13 +1602,13 @@ Checking test 030 fv3_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.180437
+  0: The total amount of wall time                        = 52.016158
 
 Test 030 fv3_gfdlmprad_gwd PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_noahmp
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_noahmp
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmprad_noahmp
 Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1633,13 +1653,13 @@ Checking test 031 fv3_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 52.319969
+  0: The total amount of wall time                        = 52.811692
 
 Test 031 fv3_gfdlmprad_noahmp PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_csawmg
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_csawmg
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_csawmg
 Checking test 032 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1684,13 +1704,13 @@ Checking test 032 fv3_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 109.398812
+  0: The total amount of wall time                        = 111.056297
 
 Test 032 fv3_csawmg PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmf
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_satmedmf
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_satmedmf
 Checking test 033 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1735,13 +1755,13 @@ Checking test 033 fv3_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 53.796980
+  0: The total amount of wall time                        = 51.489409
 
 Test 033 fv3_satmedmf PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_satmedmfq
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_satmedmfq
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_satmedmfq
 Checking test 034 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1786,13 +1806,13 @@ Checking test 034 fv3_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.514721
+  0: The total amount of wall time                        = 47.330009
 
 Test 034 fv3_satmedmfq PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmp_32bit
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmp_32bit
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmp_32bit
 Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1837,13 +1857,13 @@ Checking test 035 fv3_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 49.923095
+  0: The total amount of wall time                        = 46.764119
 
 Test 035 fv3_gfdlmp_32bit PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfdlmprad_32bit_post
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfdlmprad_32bit_post
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfdlmprad_32bit_post
 Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1892,13 +1912,13 @@ Checking test 036 fv3_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 72.847140
+  0: The total amount of wall time                        = 72.443134
 
 Test 036 fv3_gfdlmprad_32bit_post PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_cpt
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_cpt
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_cpt
 Checking test 037 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -1949,13 +1969,13 @@ Checking test 037 fv3_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 258.808684
+  0: The total amount of wall time                        = 261.739828
 
 Test 037 fv3_cpt PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gsd
 Checking test 038 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2044,13 +2064,13 @@ Checking test 038 fv3_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 181.978842
+  0: The total amount of wall time                        = 188.164520
 
 Test 038 fv3_gsd PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rap
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rap
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_rap
 Checking test 039 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2115,13 +2135,13 @@ Checking test 039 fv3_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 99.758309
+  0: The total amount of wall time                        = 98.581565
 
 Test 039 fv3_rap PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_hrrr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_hrrr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_hrrr
 Checking test 040 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2186,13 +2206,13 @@ Checking test 040 fv3_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 108.362225
+  0: The total amount of wall time                        = 109.029001
 
 Test 040 fv3_hrrr PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_thompson
 Checking test 041 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2257,13 +2277,13 @@ Checking test 041 fv3_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 96.981672
+  0: The total amount of wall time                        = 93.946234
 
 Test 041 fv3_thompson PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_no_aero
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_thompson_no_aero
 Checking test 042 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2328,13 +2348,13 @@ Checking test 042 fv3_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 89.632598
+  0: The total amount of wall time                        = 92.037144
 
 Test 042 fv3_thompson_no_aero PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rrfs_v1beta
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_rrfs_v1beta
 Checking test 043 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2399,13 +2419,13 @@ Checking test 043 fv3_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 111.207011
+  0: The total amount of wall time                        = 112.322392
 
 Test 043 fv3_rrfs_v1beta PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v15p2
 Checking test 044 fv3_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2470,13 +2490,13 @@ Checking test 044 fv3_gfs_v15p2 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 100.258678
+  0: The total amount of wall time                        = 102.189974
 
 Test 044 fv3_gfs_v15p2 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16
 Checking test 045 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2553,13 +2573,13 @@ Checking test 045 fv3_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 117.674490
+  0: The total amount of wall time                        = 111.578814
 
 Test 045 fv3_gfs_v16 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_restart
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_restart
 Checking test 046 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -2606,13 +2626,13 @@ Checking test 046 fv3_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 61.382059
+  0: The total amount of wall time                        = 62.286551
 
 Test 046 fv3_gfs_v16_restart PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_stochy
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_stochy
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_stochy
 Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2677,13 +2697,13 @@ Checking test 047 fv3_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 56.009358
+  0: The total amount of wall time                        = 52.595486
 
 Test 047 fv3_gfs_v16_stochy PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_RRTMGP
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v15p2_RRTMGP
 Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2748,13 +2768,13 @@ Checking test 048 fv3_gfs_v15p2_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 165.693850
+  0: The total amount of wall time                        = 163.887440
 
 Test 048 fv3_gfs_v15p2_RRTMGP PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_RRTMGP
 Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2819,13 +2839,13 @@ Checking test 049 fv3_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 172.052786
+  0: The total amount of wall time                        = 165.993988
 
 Test 049 fv3_gfs_v16_RRTMGP PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_c192L127
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_RRTMGP_c192L127
 Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -2884,13 +2904,13 @@ Checking test 050 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 629.327169
+  0: The total amount of wall time                        = 625.562035
 
 Test 050 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_2thrd
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_RRTMGP_2thrd
 Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -2955,13 +2975,13 @@ Checking test 051 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 177.248846
+ 0: The total amount of wall time                        = 176.015856
 
 Test 051 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmg
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_csawmg
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfsv16_csawmg
 Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3006,13 +3026,13 @@ Checking test 052 fv3_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 128.621910
+  0: The total amount of wall time                        = 130.545428
 
 Test 052 fv3_gfsv16_csawmg PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_csawmgt
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_csawmgt
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfsv16_csawmgt
 Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3057,13 +3077,13 @@ Checking test 053 fv3_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 126.372323
+  0: The total amount of wall time                        = 128.037325
 
 Test 053 fv3_gfsv16_csawmgt PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gocart_clm
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gocart_clm
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gocart_clm
 Checking test 054 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3108,13 +3128,13 @@ Checking test 054 fv3_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 61.167507
+  0: The total amount of wall time                        = 60.929529
 
 Test 054 fv3_gocart_clm PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_flake
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_flake
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_flake
 Checking test 055 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3179,13 +3199,13 @@ Checking test 055 fv3_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 113.282933
+  0: The total amount of wall time                        = 106.638832
 
 Test 055 fv3_gfs_v16_flake PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_HAFS_v0_hwrf_thompson
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_HAFS_v0_hwrf_thompson
 Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3250,13 +3270,13 @@ Checking test 056 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 151.985419
+  0: The total amount of wall time                        = 151.631406
 
 Test 056 fv3_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_esg_HAFS_v0_hwrf_thompson
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_esg_HAFS_v0_hwrf_thompson
 Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -3271,13 +3291,13 @@ Checking test 057 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 292.902368
+ 0: The total amount of wall time                        = 295.112559
 
 Test 057 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfsv16_ugwpv1
 Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3336,13 +3356,13 @@ Checking test 058 fv3_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 181.379209
+  0: The total amount of wall time                        = 167.645191
 
 Test 058 fv3_gfsv16_ugwpv1 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_warmstart
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfsv16_ugwpv1_warmstart
 Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3401,13 +3421,13 @@ Checking test 059 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 177.143703
+  0: The total amount of wall time                        = 175.648535
 
 Test 059 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_ras
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_ras
 Checking test 060 fv3_gfs_v16_ras results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3472,13 +3492,13 @@ Checking test 060 fv3_gfs_v16_ras results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 103.104727
+  0: The total amount of wall time                        = 93.123008
 
 Test 060 fv3_gfs_v16_ras PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v15p2_debug
 Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3543,13 +3563,13 @@ Checking test 061 fv3_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 242.582630
+  0: The total amount of wall time                        = 243.950865
 
 Test 061 fv3_gfs_v15p2_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_debug
 Checking test 062 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3614,13 +3634,13 @@ Checking test 062 fv3_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 185.523880
+  0: The total amount of wall time                        = 187.453483
 
 Test 062 fv3_gfs_v16_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v15p2_RRTMGP_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v15p2_RRTMGP_debug
 Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3685,13 +3705,13 @@ Checking test 063 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 371.331039
+  0: The total amount of wall time                        = 374.261105
 
 Test 063 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_RRTMGP_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_RRTMGP_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_RRTMGP_debug
 Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3756,13 +3776,13 @@ Checking test 064 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 384.243546
+  0: The total amount of wall time                        = 382.555526
 
 Test 064 fv3_gfs_v16_RRTMGP_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_regional_control_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_regional_control_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_regional_control_debug
 Checking test 065 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -3770,13 +3790,13 @@ Checking test 065 fv3_regional_control_debug results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
- 0: The total amount of wall time                        = 368.364244
+ 0: The total amount of wall time                        = 373.369585
 
 Test 065 fv3_regional_control_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_control_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_control_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_control_debug
 Checking test 066 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -3803,13 +3823,13 @@ Checking test 066 fv3_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 155.221480
+  0: The total amount of wall time                        = 150.261458
 
 Test 066 fv3_control_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_stretched_nest_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_stretched_nest_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_stretched_nest_debug
 Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
@@ -3826,13 +3846,13 @@ Checking test 067 fv3_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 375.623118
+ 0: The total amount of wall time                        = 372.625045
 
 Test 067 fv3_stretched_nest_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gsd_debug
 Checking test 068 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3897,13 +3917,13 @@ Checking test 068 fv3_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 215.241294
+  0: The total amount of wall time                        = 216.904775
 
 Test 068 fv3_gsd_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gsd_diag3d_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gsd_diag3d_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gsd_diag3d_debug
 Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -3968,13 +3988,13 @@ Checking test 069 fv3_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 295.256237
+  0: The total amount of wall time                        = 302.162771
 
 Test 069 fv3_gsd_diag3d_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_thompson_debug
 Checking test 070 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4039,13 +4059,13 @@ Checking test 070 fv3_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 353.634309
+  0: The total amount of wall time                        = 359.858399
 
 Test 070 fv3_thompson_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_thompson_no_aero_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_thompson_no_aero_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_thompson_no_aero_debug
 Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4110,13 +4130,13 @@ Checking test 071 fv3_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 333.756109
+  0: The total amount of wall time                        = 345.693456
 
 Test 071 fv3_thompson_no_aero_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_rrfs_v1beta_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_rrfs_v1beta_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_rrfs_v1beta_debug
 Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4181,13 +4201,13 @@ Checking test 072 fv3_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 209.763849
+  0: The total amount of wall time                        = 217.369735
 
 Test 072 fv3_rrfs_v1beta_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/HAFS_v0_HWRF_thompson_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_HAFS_v0_hwrf_thompson_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_HAFS_v0_hwrf_thompson_debug
 Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4252,13 +4272,13 @@ Checking test 073 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 263.676892
+  0: The total amount of wall time                        = 225.720337
 
 Test 073 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/ESG_HAFS_v0_HWRF_thompson_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_esg_HAFS_v0_hwrf_thompson_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_esg_HAFS_v0_hwrf_thompson_debug
 Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
@@ -4273,13 +4293,13 @@ Checking test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
- 0: The total amount of wall time                        = 410.622427
+ 0: The total amount of wall time                        = 424.190416
 
 Test 074 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfsv16_ugwpv1_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfsv16_ugwpv1_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfsv16_ugwpv1_debug
 Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
@@ -4338,13 +4358,13 @@ Checking test 075 fv3_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 577.490209
+  0: The total amount of wall time                        = 583.478429
 
 Test 075 fv3_gfsv16_ugwpv1_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/fv3_gfs_v16_ras_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/fv3_gfs_v16_ras_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/fv3_gfs_v16_ras_debug
 Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -4409,13 +4429,13 @@ Checking test 076 fv3_gfs_v16_ras_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 338.669822
+  0: The total amount of wall time                        = 344.240212
 
 Test 076 fv3_gfs_v16_ras_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_control
 Checking test 077 cpld_control results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4465,13 +4485,13 @@ Checking test 077 cpld_control results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 119.325516
+  0: The total amount of wall time                        = 101.860852
 
 Test 077 cpld_control PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart
 Checking test 078 cpld_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4521,13 +4541,13 @@ Checking test 078 cpld_restart results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 68.154787
+  0: The total amount of wall time                        = 65.476460
 
 Test 078 cpld_restart PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_controlfrac
 Checking test 079 cpld_controlfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4577,13 +4597,13 @@ Checking test 079 cpld_controlfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 117.598597
+  0: The total amount of wall time                        = 108.466565
 
 Test 079 cpld_controlfrac PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restartfrac
 Checking test 080 cpld_restartfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4633,13 +4653,13 @@ Checking test 080 cpld_restartfrac results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 78.913061
+  0: The total amount of wall time                        = 74.103551
 
 Test 080 cpld_restartfrac PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_2threads
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_2threads
 Checking test 081 cpld_2threads results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4689,13 +4709,13 @@ Checking test 081 cpld_2threads results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 133.379763
+  0: The total amount of wall time                        = 135.602745
 
 Test 081 cpld_2threads PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_decomp
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_decomp
 Checking test 082 cpld_decomp results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4745,13 +4765,13 @@ Checking test 082 cpld_decomp results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 104.163066
+  0: The total amount of wall time                        = 102.686077
 
 Test 082 cpld_decomp PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_satmedmf
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_satmedmf
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_satmedmf
 Checking test 083 cpld_satmedmf results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4801,13 +4821,13 @@ Checking test 083 cpld_satmedmf results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 108.150363
+  0: The total amount of wall time                        = 106.577948
 
 Test 083 cpld_satmedmf PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_ca
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_ca
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_ca
 Checking test 084 cpld_ca results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -4857,13 +4877,13 @@ Checking test 084 cpld_ca results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 111.862948
+  0: The total amount of wall time                        = 106.772190
 
 Test 084 cpld_ca PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_c192
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_control_c192
 Checking test 085 cpld_control_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4913,13 +4933,13 @@ Checking test 085 cpld_control_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 397.017496
+  0: The total amount of wall time                        = 394.095414
 
 Test 085 cpld_control_c192 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c192
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_c192
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart_c192
 Checking test 086 cpld_restart_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -4969,13 +4989,13 @@ Checking test 086 cpld_restart_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 272.736278
+  0: The total amount of wall time                        = 269.148793
 
 Test 086 cpld_restart_c192 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac_c192
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_controlfrac_c192
 Checking test 087 cpld_controlfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5025,13 +5045,13 @@ Checking test 087 cpld_controlfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 400.553613
+  0: The total amount of wall time                        = 383.675006
 
 Test 087 cpld_controlfrac_c192 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c192
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac_c192
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restartfrac_c192
 Checking test 088 cpld_restartfrac_c192 results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
@@ -5081,13 +5101,13 @@ Checking test 088 cpld_restartfrac_c192 results ....
  Comparing RESTART/iced.2016-10-05-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-05-00000.nc .........OK
 
-  0: The total amount of wall time                        = 278.647891
+  0: The total amount of wall time                        = 269.767705
 
 Test 088 cpld_restartfrac_c192 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_c384
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_control_c384
 Checking test 089 cpld_control_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5140,13 +5160,13 @@ Checking test 089 cpld_control_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1336.147422
+  0: The total amount of wall time                        = 1328.094632
 
 Test 089 cpld_control_c384 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_c384
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_c384
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart_c384
 Checking test 090 cpld_restart_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5199,13 +5219,13 @@ Checking test 090 cpld_restart_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 713.934599
+  0: The total amount of wall time                        = 693.331967
 
 Test 090 cpld_restart_c384 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_controlfrac_c384
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_controlfrac_c384
 Checking test 091 cpld_controlfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5258,13 +5278,13 @@ Checking test 091 cpld_controlfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1406.099769
+  0: The total amount of wall time                        = 1316.562844
 
 Test 091 cpld_controlfrac_c384 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_controlfrac_c384
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restartfrac_c384
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restartfrac_c384
 Checking test 092 cpld_restartfrac_c384 results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5317,13 +5337,13 @@ Checking test 092 cpld_restartfrac_c384 results ....
  Comparing RESTART/iced.2016-10-04-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
 
-  0: The total amount of wall time                        = 706.690926
+  0: The total amount of wall time                        = 677.544485
 
 Test 092 cpld_restartfrac_c384 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmark
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmark
 Checking test 093 cpld_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5376,13 +5396,13 @@ Checking test 093 cpld_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 824.173979
+  0: The total amount of wall time                        = 834.684270
 
 Test 093 cpld_bmark PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmark
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart_bmark
 Checking test 094 cpld_restart_bmark results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5435,13 +5455,13 @@ Checking test 094 cpld_restart_bmark results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 457.215343
+  0: The total amount of wall time                        = 442.270687
 
 Test 094 cpld_restart_bmark PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmarkfrac
 Checking test 095 cpld_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5494,13 +5514,13 @@ Checking test 095 cpld_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 829.110986
+  0: The total amount of wall time                        = 826.817121
 
 Test 095 cpld_bmarkfrac PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmarkfrac
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart_bmarkfrac
 Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5553,13 +5573,13 @@ Checking test 096 cpld_restart_bmarkfrac results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 453.932339
+  0: The total amount of wall time                        = 436.932599
 
 Test 096 cpld_restart_bmarkfrac PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_v16
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmarkfrac_v16
 Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5612,13 +5632,13 @@ Checking test 097 cpld_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 1344.124539
+  0: The total amount of wall time                        = 1332.676304
 
 Test 097 cpld_bmarkfrac_v16 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_v16
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_restart_bmarkfrac_v16
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_restart_bmarkfrac_v16
 Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing phyf012.tile1.nc .........OK
  Comparing phyf012.tile2.nc .........OK
@@ -5671,13 +5691,13 @@ Checking test 098 cpld_restart_bmarkfrac_v16 results ....
  Comparing RESTART/iced.2013-04-01-43200.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 740.990276
+  0: The total amount of wall time                        = 726.331517
 
 Test 098 cpld_restart_bmarkfrac_v16 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmark_wave
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmark_wave
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmark_wave
 Checking test 099 cpld_bmark_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5733,13 +5753,13 @@ Checking test 099 cpld_bmark_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1432.098204
+  0: The total amount of wall time                        = 1441.141040
 
 Test 099 cpld_bmark_wave PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_wave
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmarkfrac_wave
 Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5795,13 +5815,13 @@ Checking test 100 cpld_bmarkfrac_wave results ....
  Comparing RESTART/iced.2013-04-02-00000.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1429.371386
+  0: The total amount of wall time                        = 1420.068920
 
 Test 100 cpld_bmarkfrac_wave PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_bmarkfrac_wave_v16
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_bmarkfrac_wave_v16
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_bmarkfrac_wave_v16
 Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5856,13 +5876,13 @@ Checking test 101 cpld_bmarkfrac_wave_v16 results ....
  Comparing RESTART/iced.2013-04-01-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 951.222093
+  0: The total amount of wall time                        = 945.773922
 
 Test 101 cpld_bmarkfrac_wave_v16 PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_control_wave
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_control_wave
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_control_wave
 Checking test 102 cpld_control_wave results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
@@ -5915,13 +5935,13 @@ Checking test 102 cpld_control_wave results ....
  Comparing 20161004.000000.out_pnt.points .........OK
  Comparing 20161004.000000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 815.263136
+  0: The total amount of wall time                        = 821.600514
 
 Test 102 cpld_control_wave PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debug
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_debug
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_debug
 Checking test 103 cpld_debug results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -5971,13 +5991,13 @@ Checking test 103 cpld_debug results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 341.676165
+  0: The total amount of wall time                        = 333.488070
 
 Test 103 cpld_debug PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/cpld_debugfrac
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/cpld_debugfrac
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/cpld_debugfrac
 Checking test 104 cpld_debugfrac results ....
  Comparing phyf006.tile1.nc .........OK
  Comparing phyf006.tile2.nc .........OK
@@ -6027,73 +6047,73 @@ Checking test 104 cpld_debugfrac results ....
  Comparing RESTART/iced.2016-10-03-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc .........OK
 
-  0: The total amount of wall time                        = 327.395689
+  0: The total amount of wall time                        = 1386.257202
 
 Test 104 cpld_debugfrac PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_control_cfsr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_control_cfsr
 Checking test 105 datm_control_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 104.235935
+  0: The total amount of wall time                        = 101.019579
 
 Test 105 datm_control_cfsr PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_cfsr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_restart_cfsr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_restart_cfsr
 Checking test 106 datm_restart_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 71.592949
+  0: The total amount of wall time                        = 71.648752
 
 Test 106 datm_restart_cfsr PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_control_gefs
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_control_gefs
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_control_gefs
 Checking test 107 datm_control_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 97.500170
+  0: The total amount of wall time                        = 94.086336
 
 Test 107 datm_control_gefs PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_cfsr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_bulk_cfsr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_bulk_cfsr
 Checking test 108 datm_bulk_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 105.271493
+  0: The total amount of wall time                        = 97.609697
 
 Test 108 datm_bulk_cfsr PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_bulk_gefs
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_bulk_gefs
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_bulk_gefs
 Checking test 109 datm_bulk_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 92.326933
+  0: The total amount of wall time                        = 96.111352
 
 Test 109 datm_bulk_gefs PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_cfsr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_mx025_cfsr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_mx025_cfsr
 Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6102,13 +6122,13 @@ Checking test 110 datm_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 387.359123
+  0: The total amount of wall time                        = 381.993465
 
 Test 110 datm_mx025_cfsr PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_mx025_gefs
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_mx025_gefs
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_mx025_gefs
 Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
@@ -6117,23 +6137,23 @@ Checking test 111 datm_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-02-00000.nc .........OK
 
-  0: The total amount of wall time                        = 409.867554
+  0: The total amount of wall time                        = 382.126847
 
 Test 111 datm_mx025_gefs PASS
 
 
 baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/INTEL/datm_debug_cfsr
-working dir  = /work/noaa/gsienkf/ppegion/stmp/ppegion/FV3_RT/rt_229271/datm_debug_cfsr
+working dir  = /work/noaa/stmp/djovic/stmp/djovic/FV3_RT/rt_369147/datm_debug_cfsr
 Checking test 112 datm_debug_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
-  0: The total amount of wall time                        = 290.904811
+  0: The total amount of wall time                        = 287.666163
 
 Test 112 datm_debug_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Mar 19 14:13:34 CDT 2021
-Elapsed time: 01h:23m:02s. Have a nice day!
+Tue Mar 23 09:18:07 CDT 2021
+Elapsed time: 01h:24m:39s. Have a nice day!
diff --git a/tests/RegressionTests_stampede.intel.log b/tests/RegressionTests_stampede.intel.log
new file mode 100644
index 0000000000..00e5a787c3
--- /dev/null
+++ b/tests/RegressionTests_stampede.intel.log
@@ -0,0 +1,252 @@
+Sun Mar 21 22:01:01 CDT 2021
+Start Regression test
+
+Compile 001 elapsed time 569 seconds. SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y WW3=Y
+
+baseline dir = /work/07736/minsukji/stampede2/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/cpld_bmark_wave
+working dir  = /scratch/07736/minsukji/ufs-weather-model/run/minsukji/FV3_RT/rt_216780/cpld_bmark_wave
+Checking test 001 cpld_bmark_wave results ....
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing 20130402.000000.out_grd.gwes_30m .........OK
+ Comparing 20130402.000000.out_pnt.points .........OK
+ Comparing 20130402.000000.restart.gwes_30m .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/MOM.res_1.nc .........OK
+ Comparing RESTART/MOM.res_2.nc .........OK
+ Comparing RESTART/MOM.res_3.nc .........OK
+ Comparing RESTART/iced.2013-04-02-00000.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
+
+The total amount of wall time                        = 1513.274982
+
+Test 001 cpld_bmark_wave PASS
+
+
+baseline dir = /work/07736/minsukji/stampede2/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/cpld_bmarkfrac_wave
+working dir  = /scratch/07736/minsukji/ufs-weather-model/run/minsukji/FV3_RT/rt_216780/cpld_bmarkfrac_wave
+Checking test 002 cpld_bmarkfrac_wave results ....
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing 20130402.000000.out_grd.gwes_30m .........OK
+ Comparing 20130402.000000.out_pnt.points .........OK
+ Comparing 20130402.000000.restart.gwes_30m .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/MOM.res_1.nc .........OK
+ Comparing RESTART/MOM.res_2.nc .........OK
+ Comparing RESTART/MOM.res_3.nc .........OK
+ Comparing RESTART/iced.2013-04-02-00000.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-02-00000.nc .........OK
+
+The total amount of wall time                        = 1511.941093
+
+Test 002 cpld_bmarkfrac_wave PASS
+
+
+baseline dir = /work/07736/minsukji/stampede2/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/cpld_bmarkfrac_wave_v16
+working dir  = /scratch/07736/minsukji/ufs-weather-model/run/minsukji/FV3_RT/rt_216780/cpld_bmarkfrac_wave_v16
+Checking test 003 cpld_bmarkfrac_wave_v16 results ....
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing 20130401.060000.out_grd.gwes_30m .........OK
+ Comparing 20130401.060000.out_pnt.points .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/MOM.res_1.nc .........OK
+ Comparing RESTART/MOM.res_2.nc .........OK
+ Comparing RESTART/MOM.res_3.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+
+The total amount of wall time                        = 1019.892656
+
+Test 003 cpld_bmarkfrac_wave_v16 PASS
+
+
+baseline dir = /work/07736/minsukji/stampede2/ufs-weather-model/RT/NEMSfv3gfs/develop-20210318/cpld_control_wave
+working dir  = /scratch/07736/minsukji/ufs-weather-model/run/minsukji/FV3_RT/rt_216780/cpld_control_wave
+Checking test 004 cpld_control_wave results ....
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/iced.2016-10-04-00000.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc .........OK
+ Comparing 20161004.000000.out_grd.glo_1deg .........OK
+ Comparing 20161004.000000.out_pnt.points .........OK
+ Comparing 20161004.000000.restart.glo_1deg .........OK
+
+The total amount of wall time                        = 753.637820
+
+Test 004 cpld_control_wave PASS
+
+
+REGRESSION TEST WAS SUCCESSFUL
+Mon Mar 22 02:13:36 CDT 2021
+Elapsed time: 04h:12m:35s. Have a nice day!
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
index a29b81b18f..73259c41ed 100644
--- a/tests/RegressionTests_wcoss_cray.log
+++ b/tests/RegressionTests_wcoss_cray.log
@@ -1,10 +1,24 @@
-Mon Mar 15 15:10:33 UTC 2021
+Tue Mar 23 19:01:32 UTC 2021
 Start Regression test
 
-
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_control_prod
-Checking test 001 fv3_ccpp_control results ....
+Compile 001 elapsed time 900 seconds. APP=ATM SUITES=FV3_GFS_2017
+Compile 002 elapsed time 902 seconds. APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+Compile 003 elapsed time 936 seconds. APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y
+Compile 004 elapsed time 929 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y
+Compile 005 elapsed time 913 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp
+Compile 006 elapsed time 979 seconds. APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq
+Compile 007 elapsed time 1023 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y
+Compile 008 elapsed time 960 seconds. APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP
+Compile 009 elapsed time 944 seconds. APP=ATM SUITES=FV3_GFS_v16_csawmg
+Compile 010 elapsed time 936 seconds. APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+Compile 011 elapsed time 1018 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras
+Compile 012 elapsed time 563 seconds. APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP
+Compile 013 elapsed time 546 seconds. APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y
+Compile 014 elapsed time 534 seconds. APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y
+
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_control
+Checking test 001 fv3_control results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -68,14 +82,14 @@ Checking test 001 fv3_ccpp_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 99.580387
+The total amount of wall time                        = 54.181357
 
-Test 001 fv3_ccpp_control PASS
+Test 001 fv3_control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_decomp_prod
-Checking test 002 fv3_ccpp_decomp results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_decomp
+Checking test 002 fv3_decomp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -139,14 +153,14 @@ Checking test 002 fv3_ccpp_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 93.681293
+The total amount of wall time                        = 55.766983
 
-Test 002 fv3_ccpp_decomp PASS
+Test 002 fv3_decomp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_2threads_prod
-Checking test 003 fv3_ccpp_2threads results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_2threads
+Checking test 003 fv3_2threads results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -210,14 +224,14 @@ Checking test 003 fv3_ccpp_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 47.362766
+The total amount of wall time                        = 45.593699
 
-Test 003 fv3_ccpp_2threads PASS
+Test 003 fv3_2threads PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_restart_prod
-Checking test 004 fv3_ccpp_restart results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_restart
+Checking test 004 fv3_restart results ....
  Comparing phyf024.tile1.nc .........OK
  Comparing phyf024.tile2.nc .........OK
  Comparing phyf024.tile3.nc .........OK
@@ -263,14 +277,14 @@ Checking test 004 fv3_ccpp_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 24.842162
+The total amount of wall time                        = 23.633691
 
-Test 004 fv3_ccpp_restart PASS
+Test 004 fv3_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_read_inc_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_read_inc_prod
-Checking test 005 fv3_ccpp_read_inc results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_read_inc
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_read_inc
+Checking test 005 fv3_read_inc results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -334,14 +348,14 @@ Checking test 005 fv3_ccpp_read_inc results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.148666
+The total amount of wall time                        = 51.290996
 
-Test 005 fv3_ccpp_read_inc PASS
+Test 005 fv3_read_inc PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGauss_netcdf_esmf_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGauss_netcdf_esmf_prod
-Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGauss_netcdf_esmf
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGauss_netcdf_esmf
+Checking test 006 fv3_wrtGauss_netcdf_esmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -385,14 +399,14 @@ Checking test 006 fv3_ccpp_wrtGauss_netcdf_esmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 130.613144
+The total amount of wall time                        = 118.662507
 
-Test 006 fv3_ccpp_wrtGauss_netcdf_esmf PASS
+Test 006 fv3_wrtGauss_netcdf_esmf PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGauss_netcdf_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGauss_netcdf_prod
-Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGauss_netcdf
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGauss_netcdf
+Checking test 007 fv3_wrtGauss_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -436,14 +450,14 @@ Checking test 007 fv3_ccpp_wrtGauss_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 56.133268
+The total amount of wall time                        = 47.672881
 
-Test 007 fv3_ccpp_wrtGauss_netcdf PASS
+Test 007 fv3_wrtGauss_netcdf PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGauss_netcdf_parallel_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGauss_netcdf_parallel_prod
-Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGauss_netcdf_parallel
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGauss_netcdf_parallel
+Checking test 008 fv3_wrtGauss_netcdf_parallel results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -487,14 +501,14 @@ Checking test 008 fv3_ccpp_wrtGauss_netcdf_parallel results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 156.252763
+The total amount of wall time                        = 53.153928
 
-Test 008 fv3_ccpp_wrtGauss_netcdf_parallel PASS
+Test 008 fv3_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGlatlon_netcdf_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGlatlon_netcdf_prod
-Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGlatlon_netcdf
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGlatlon_netcdf
+Checking test 009 fv3_wrtGlatlon_netcdf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -538,14 +552,14 @@ Checking test 009 fv3_ccpp_wrtGlatlon_netcdf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 59.755501
+The total amount of wall time                        = 48.378979
 
-Test 009 fv3_ccpp_wrtGlatlon_netcdf PASS
+Test 009 fv3_wrtGlatlon_netcdf PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGauss_nemsio_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGauss_nemsio_prod
-Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGauss_nemsio
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGauss_nemsio
+Checking test 010 fv3_wrtGauss_nemsio results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -589,14 +603,14 @@ Checking test 010 fv3_ccpp_wrtGauss_nemsio results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 54.126902
+The total amount of wall time                        = 48.341767
 
-Test 010 fv3_ccpp_wrtGauss_nemsio PASS
+Test 010 fv3_wrtGauss_nemsio PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_wrtGauss_nemsio_c192_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_wrtGauss_nemsio_c192_prod
-Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_wrtGauss_nemsio_c192
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_wrtGauss_nemsio_c192
+Checking test 011 fv3_wrtGauss_nemsio_c192 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -640,14 +654,14 @@ Checking test 011 fv3_ccpp_wrtGauss_nemsio_c192 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 150.745275
+The total amount of wall time                        = 121.534151
 
-Test 011 fv3_ccpp_wrtGauss_nemsio_c192 PASS
+Test 011 fv3_wrtGauss_nemsio_c192 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_stochy_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_stochy_prod
-Checking test 012 fv3_ccpp_stochy results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_stochy
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_stochy
+Checking test 012 fv3_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -711,14 +725,14 @@ Checking test 012 fv3_ccpp_stochy results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 56.852801
+The total amount of wall time                        = 54.164695
 
-Test 012 fv3_ccpp_stochy PASS
+Test 012 fv3_stochy PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_ca_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_ca_prod
-Checking test 013 fv3_ccpp_ca results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_ca
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_ca
+Checking test 013 fv3_ca results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -782,14 +796,14 @@ Checking test 013 fv3_ccpp_ca results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 114.296214
+The total amount of wall time                        = 39.725006
 
-Test 013 fv3_ccpp_ca PASS
+Test 013 fv3_ca PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_lndp_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_lndp_prod
-Checking test 014 fv3_ccpp_lndp results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_lndp
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_lndp
+Checking test 014 fv3_lndp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -853,14 +867,14 @@ Checking test 014 fv3_ccpp_lndp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 69.905051
+The total amount of wall time                        = 56.313339
 
-Test 014 fv3_ccpp_lndp PASS
+Test 014 fv3_lndp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_iau_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_iau_prod
-Checking test 015 fv3_ccpp_iau results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_iau
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_iau
+Checking test 015 fv3_iau results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -924,14 +938,14 @@ Checking test 015 fv3_ccpp_iau results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 49.435697
+The total amount of wall time                        = 49.355312
 
-Test 015 fv3_ccpp_iau PASS
+Test 015 fv3_iau PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_lheatstrg_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_lheatstrg_prod
-Checking test 016 fv3_ccpp_lheatstrg results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_lheatstrg
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_lheatstrg
+Checking test 016 fv3_lheatstrg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -975,14 +989,14 @@ Checking test 016 fv3_ccpp_lheatstrg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 51.358493
+The total amount of wall time                        = 47.862734
 
-Test 016 fv3_ccpp_lheatstrg PASS
+Test 016 fv3_lheatstrg PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_multigases_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_multigases_prod
-Checking test 017 fv3_ccpp_multigases results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_multigases_repro
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_multigases_repro
+Checking test 017 fv3_multigases results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1052,14 +1066,14 @@ Checking test 017 fv3_ccpp_multigases results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.482825
+The total amount of wall time                        = 98.393273
 
-Test 017 fv3_ccpp_multigases PASS
+Test 017 fv3_multigases PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_32bit_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_control_32bit_prod
-Checking test 018 fv3_ccpp_control_32bit results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control_32bit
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_control_32bit
+Checking test 018 fv3_control_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1123,14 +1137,14 @@ Checking test 018 fv3_ccpp_control_32bit results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 109.052814
+The total amount of wall time                        = 50.903327
 
-Test 018 fv3_ccpp_control_32bit PASS
+Test 018 fv3_control_32bit PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_stretched_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_stretched_prod
-Checking test 019 fv3_ccpp_stretched results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_stretched
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_stretched
+Checking test 019 fv3_stretched results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1182,14 +1196,14 @@ Checking test 019 fv3_ccpp_stretched results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 355.139031
+The total amount of wall time                        = 323.540037
 
-Test 019 fv3_ccpp_stretched PASS
+Test 019 fv3_stretched PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_stretched_nest_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_stretched_nest_prod
-Checking test 020 fv3_ccpp_stretched_nest results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_stretched_nest
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_stretched_nest
+Checking test 020 fv3_stretched_nest results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1252,40 +1266,40 @@ Checking test 020 fv3_ccpp_stretched_nest results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/sfc_data.nest02.tile7.nc .........OK
 
-The total amount of wall time                        = 493.564882
+The total amount of wall time                        = 358.312525
 
-Test 020 fv3_ccpp_stretched_nest PASS
+Test 020 fv3_stretched_nest PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_control_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_control_prod
-Checking test 021 fv3_ccpp_regional_control results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_control
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_control
+Checking test 021 fv3_regional_control results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 708.691047
+The total amount of wall time                        = 694.918940
 
-Test 021 fv3_ccpp_regional_control PASS
+Test 021 fv3_regional_control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_restart_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_restart_prod
-Checking test 022 fv3_ccpp_regional_restart results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_restart
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_restart
+Checking test 022 fv3_regional_restart results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
 
-The total amount of wall time                        = 408.314958
+The total amount of wall time                        = 410.922728
 
-Test 022 fv3_ccpp_regional_restart PASS
+Test 022 fv3_regional_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_quilt_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_quilt_prod
-Checking test 023 fv3_ccpp_regional_quilt results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_quilt
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_quilt
+Checking test 023 fv3_regional_quilt results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1295,14 +1309,14 @@ Checking test 023 fv3_ccpp_regional_quilt results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 702.871821
+The total amount of wall time                        = 700.289611
 
-Test 023 fv3_ccpp_regional_quilt PASS
+Test 023 fv3_regional_quilt PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_quilt_hafs_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_quilt_hafs_prod
-Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_quilt_hafs
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_quilt_hafs
+Checking test 024 fv3_regional_quilt_hafs results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1310,28 +1324,28 @@ Checking test 024 fv3_ccpp_regional_quilt_hafs results ....
  Comparing HURPRS.GrbF00 .........OK
  Comparing HURPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 702.577217
+The total amount of wall time                        = 698.328839
 
-Test 024 fv3_ccpp_regional_quilt_hafs PASS
+Test 024 fv3_regional_quilt_hafs PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_quilt_netcdf_parallel_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_quilt_netcdf_parallel_prod
-Checking test 025 fv3_ccpp_regional_quilt_netcdf_parallel results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_quilt_netcdf_parallel
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_quilt_netcdf_parallel
+Checking test 025 fv3_regional_quilt_netcdf_parallel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 702.357430
+The total amount of wall time                        = 700.867561
 
-Test 025 fv3_ccpp_regional_quilt_netcdf_parallel PASS
+Test 025 fv3_regional_quilt_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfdlmp_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfdlmp_prod
-Checking test 026 fv3_ccpp_gfdlmp results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfdlmp
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfdlmp
+Checking test 026 fv3_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1375,14 +1389,14 @@ Checking test 026 fv3_ccpp_gfdlmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 122.097066
+The total amount of wall time                        = 55.665164
 
-Test 026 fv3_ccpp_gfdlmp PASS
+Test 026 fv3_gfdlmp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfdlmprad_gwd_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfdlmprad_gwd_prod
-Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfdlmprad_gwd
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfdlmprad_gwd
+Checking test 027 fv3_gfdlmprad_gwd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1426,14 +1440,14 @@ Checking test 027 fv3_ccpp_gfdlmprad_gwd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 98.792328
+The total amount of wall time                        = 55.944638
 
-Test 027 fv3_ccpp_gfdlmprad_gwd PASS
+Test 027 fv3_gfdlmprad_gwd PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfdlmprad_noahmp_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfdlmprad_noahmp_prod
-Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfdlmprad_noahmp
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfdlmprad_noahmp
+Checking test 028 fv3_gfdlmprad_noahmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1477,14 +1491,14 @@ Checking test 028 fv3_ccpp_gfdlmprad_noahmp results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 102.487017
+The total amount of wall time                        = 68.670490
 
-Test 028 fv3_ccpp_gfdlmprad_noahmp PASS
+Test 028 fv3_gfdlmprad_noahmp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_csawmg_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_csawmg_prod
-Checking test 029 fv3_ccpp_csawmg results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_csawmg
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_csawmg
+Checking test 029 fv3_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1528,14 +1542,14 @@ Checking test 029 fv3_ccpp_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 161.005073
+The total amount of wall time                        = 128.721390
 
-Test 029 fv3_ccpp_csawmg PASS
+Test 029 fv3_csawmg PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_satmedmf_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_satmedmf_prod
-Checking test 030 fv3_ccpp_satmedmf results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_satmedmf
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_satmedmf
+Checking test 030 fv3_satmedmf results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1579,14 +1593,14 @@ Checking test 030 fv3_ccpp_satmedmf results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 58.566167
+The total amount of wall time                        = 59.137603
 
-Test 030 fv3_ccpp_satmedmf PASS
+Test 030 fv3_satmedmf PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_satmedmfq_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_satmedmfq_prod
-Checking test 031 fv3_ccpp_satmedmfq results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_satmedmfq
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_satmedmfq
+Checking test 031 fv3_satmedmfq results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1630,14 +1644,14 @@ Checking test 031 fv3_ccpp_satmedmfq results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 57.543109
+The total amount of wall time                        = 58.300887
 
-Test 031 fv3_ccpp_satmedmfq PASS
+Test 031 fv3_satmedmfq PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfdlmp_32bit_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfdlmp_32bit_prod
-Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfdlmp_32bit
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfdlmp_32bit
+Checking test 032 fv3_gfdlmp_32bit results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1681,14 +1695,14 @@ Checking test 032 fv3_ccpp_gfdlmp_32bit results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 60.637933
+The total amount of wall time                        = 48.189951
 
-Test 032 fv3_ccpp_gfdlmp_32bit PASS
+Test 032 fv3_gfdlmp_32bit PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfdlmprad_32bit_post_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfdlmprad_32bit_post_prod
-Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfdlmprad_32bit_post
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfdlmprad_32bit_post
+Checking test 033 fv3_gfdlmprad_32bit_post results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1736,14 +1750,14 @@ Checking test 033 fv3_ccpp_gfdlmprad_32bit_post results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 114.488328
+The total amount of wall time                        = 100.233980
 
-Test 033 fv3_ccpp_gfdlmprad_32bit_post PASS
+Test 033 fv3_gfdlmprad_32bit_post PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_cpt_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_cpt_prod
-Checking test 034 fv3_ccpp_cpt results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_cpt
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_cpt
+Checking test 034 fv3_cpt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1793,14 +1807,14 @@ Checking test 034 fv3_ccpp_cpt results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 289.126417
+The total amount of wall time                        = 285.318168
 
-Test 034 fv3_ccpp_cpt PASS
+Test 034 fv3_cpt PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gsd_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gsd_prod
-Checking test 035 fv3_ccpp_gsd results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gsd
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gsd
+Checking test 035 fv3_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1888,14 +1902,14 @@ Checking test 035 fv3_ccpp_gsd results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.176066
+The total amount of wall time                        = 198.948099
 
-Test 035 fv3_ccpp_gsd PASS
+Test 035 fv3_gsd PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_rap_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_rap_prod
-Checking test 036 fv3_ccpp_rap results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_rap
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_rap
+Checking test 036 fv3_rap results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -1959,14 +1973,14 @@ Checking test 036 fv3_ccpp_rap results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.102948
+The total amount of wall time                        = 103.121426
 
-Test 036 fv3_ccpp_rap PASS
+Test 036 fv3_rap PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_hrrr_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_hrrr_prod
-Checking test 037 fv3_ccpp_hrrr results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_hrrr
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_hrrr
+Checking test 037 fv3_hrrr results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2030,14 +2044,14 @@ Checking test 037 fv3_ccpp_hrrr results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 121.642248
+The total amount of wall time                        = 110.194777
 
-Test 037 fv3_ccpp_hrrr PASS
+Test 037 fv3_hrrr PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_thompson_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_thompson_prod
-Checking test 038 fv3_ccpp_thompson results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_thompson
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_thompson
+Checking test 038 fv3_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2101,14 +2115,14 @@ Checking test 038 fv3_ccpp_thompson results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 98.285796
+The total amount of wall time                        = 97.531919
 
-Test 038 fv3_ccpp_thompson PASS
+Test 038 fv3_thompson PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_thompson_no_aero_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_thompson_no_aero_prod
-Checking test 039 fv3_ccpp_thompson_no_aero results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_thompson_no_aero
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_thompson_no_aero
+Checking test 039 fv3_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2172,14 +2186,14 @@ Checking test 039 fv3_ccpp_thompson_no_aero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 93.686278
+The total amount of wall time                        = 92.294440
 
-Test 039 fv3_ccpp_thompson_no_aero PASS
+Test 039 fv3_thompson_no_aero PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_rrfs_v1beta_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_rrfs_v1beta_prod
-Checking test 040 fv3_ccpp_rrfs_v1beta results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_rrfs_v1beta
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_rrfs_v1beta
+Checking test 040 fv3_rrfs_v1beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2243,85 +2257,16 @@ Checking test 040 fv3_ccpp_rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 111.501950
-
-Test 040 fv3_ccpp_rrfs_v1beta PASS
-
-
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v15p2_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v15p2_prod
-Checking test 041 fv3_ccpp_gfs_v15p2 results ....
- Comparing atmos_4xdaily.tile1.nc .........OK
- Comparing atmos_4xdaily.tile2.nc .........OK
- Comparing atmos_4xdaily.tile3.nc .........OK
- Comparing atmos_4xdaily.tile4.nc .........OK
- Comparing atmos_4xdaily.tile5.nc .........OK
- Comparing atmos_4xdaily.tile6.nc .........OK
- Comparing phyf000.tile1.nc .........OK
- Comparing phyf000.tile2.nc .........OK
- Comparing phyf000.tile3.nc .........OK
- Comparing phyf000.tile4.nc .........OK
- Comparing phyf000.tile5.nc .........OK
- Comparing phyf000.tile6.nc .........OK
- Comparing phyf024.tile1.nc .........OK
- Comparing phyf024.tile2.nc .........OK
- Comparing phyf024.tile3.nc .........OK
- Comparing phyf024.tile4.nc .........OK
- Comparing phyf024.tile5.nc .........OK
- Comparing phyf024.tile6.nc .........OK
- Comparing dynf000.tile1.nc .........OK
- Comparing dynf000.tile2.nc .........OK
- Comparing dynf000.tile3.nc .........OK
- Comparing dynf000.tile4.nc .........OK
- Comparing dynf000.tile5.nc .........OK
- Comparing dynf000.tile6.nc .........OK
- Comparing dynf024.tile1.nc .........OK
- Comparing dynf024.tile2.nc .........OK
- Comparing dynf024.tile3.nc .........OK
- Comparing dynf024.tile4.nc .........OK
- Comparing dynf024.tile5.nc .........OK
- Comparing dynf024.tile6.nc .........OK
- Comparing RESTART/coupler.res .........OK
- Comparing RESTART/fv_core.res.nc .........OK
- Comparing RESTART/fv_core.res.tile1.nc .........OK
- Comparing RESTART/fv_core.res.tile2.nc .........OK
- Comparing RESTART/fv_core.res.tile3.nc .........OK
- Comparing RESTART/fv_core.res.tile4.nc .........OK
- Comparing RESTART/fv_core.res.tile5.nc .........OK
- Comparing RESTART/fv_core.res.tile6.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1.nc .........OK
- Comparing RESTART/fv_tracer.res.tile2.nc .........OK
- Comparing RESTART/fv_tracer.res.tile3.nc .........OK
- Comparing RESTART/fv_tracer.res.tile4.nc .........OK
- Comparing RESTART/fv_tracer.res.tile5.nc .........OK
- Comparing RESTART/fv_tracer.res.tile6.nc .........OK
- Comparing RESTART/sfc_data.tile1.nc .........OK
- Comparing RESTART/sfc_data.tile2.nc .........OK
- Comparing RESTART/sfc_data.tile3.nc .........OK
- Comparing RESTART/sfc_data.tile4.nc .........OK
- Comparing RESTART/sfc_data.tile5.nc .........OK
- Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
+The total amount of wall time                        = 109.548864
 
-The total amount of wall time                        = 109.180521
+Test 040 fv3_rrfs_v1beta PASS
 
-Test 041 fv3_ccpp_gfs_v15p2 PASS
+Test 041 fv3_gfs_v15p2 FAIL
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_prod
-Checking test 042 fv3_ccpp_gfs_v16 results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16
+Checking test 042 fv3_gfs_v16 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2397,14 +2342,14 @@ Checking test 042 fv3_ccpp_gfs_v16 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 131.858752
+The total amount of wall time                        = 124.119466
 
-Test 042 fv3_ccpp_gfs_v16 PASS
+Test 042 fv3_gfs_v16 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_restart_prod
-Checking test 043 fv3_ccpp_gfs_v16_restart results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_restart
+Checking test 043 fv3_gfs_v16_restart results ....
  Comparing phyf048.tile1.nc .........OK
  Comparing phyf048.tile2.nc .........OK
  Comparing phyf048.tile3.nc .........OK
@@ -2450,14 +2395,14 @@ Checking test 043 fv3_ccpp_gfs_v16_restart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 68.244794
+The total amount of wall time                        = 66.460357
 
-Test 043 fv3_ccpp_gfs_v16_restart PASS
+Test 043 fv3_gfs_v16_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_stochy_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_stochy_prod
-Checking test 044 fv3_ccpp_gfs_v16_stochy results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_stochy
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_stochy
+Checking test 044 fv3_gfs_v16_stochy results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2521,85 +2466,16 @@ Checking test 044 fv3_ccpp_gfs_v16_stochy results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 62.121171
+The total amount of wall time                        = 60.644591
 
-Test 044 fv3_ccpp_gfs_v16_stochy PASS
+Test 044 fv3_gfs_v16_stochy PASS
 
+Test 045 fv3_gfs_v15p2_RRTMGP FAIL
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v15p2_RRTMGP_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v15p2_RRTMGP_prod
-Checking test 045 fv3_ccpp_gfs_v15p2_RRTMGP results ....
- Comparing atmos_4xdaily.tile1.nc .........OK
- Comparing atmos_4xdaily.tile2.nc .........OK
- Comparing atmos_4xdaily.tile3.nc .........OK
- Comparing atmos_4xdaily.tile4.nc .........OK
- Comparing atmos_4xdaily.tile5.nc .........OK
- Comparing atmos_4xdaily.tile6.nc .........OK
- Comparing phyf000.tile1.nc .........OK
- Comparing phyf000.tile2.nc .........OK
- Comparing phyf000.tile3.nc .........OK
- Comparing phyf000.tile4.nc .........OK
- Comparing phyf000.tile5.nc .........OK
- Comparing phyf000.tile6.nc .........OK
- Comparing phyf024.tile1.nc .........OK
- Comparing phyf024.tile2.nc .........OK
- Comparing phyf024.tile3.nc .........OK
- Comparing phyf024.tile4.nc .........OK
- Comparing phyf024.tile5.nc .........OK
- Comparing phyf024.tile6.nc .........OK
- Comparing dynf000.tile1.nc .........OK
- Comparing dynf000.tile2.nc .........OK
- Comparing dynf000.tile3.nc .........OK
- Comparing dynf000.tile4.nc .........OK
- Comparing dynf000.tile5.nc .........OK
- Comparing dynf000.tile6.nc .........OK
- Comparing dynf024.tile1.nc .........OK
- Comparing dynf024.tile2.nc .........OK
- Comparing dynf024.tile3.nc .........OK
- Comparing dynf024.tile4.nc .........OK
- Comparing dynf024.tile5.nc .........OK
- Comparing dynf024.tile6.nc .........OK
- Comparing RESTART/coupler.res .........OK
- Comparing RESTART/fv_core.res.nc .........OK
- Comparing RESTART/fv_core.res.tile1.nc .........OK
- Comparing RESTART/fv_core.res.tile2.nc .........OK
- Comparing RESTART/fv_core.res.tile3.nc .........OK
- Comparing RESTART/fv_core.res.tile4.nc .........OK
- Comparing RESTART/fv_core.res.tile5.nc .........OK
- Comparing RESTART/fv_core.res.tile6.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
- Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
- Comparing RESTART/fv_tracer.res.tile1.nc .........OK
- Comparing RESTART/fv_tracer.res.tile2.nc .........OK
- Comparing RESTART/fv_tracer.res.tile3.nc .........OK
- Comparing RESTART/fv_tracer.res.tile4.nc .........OK
- Comparing RESTART/fv_tracer.res.tile5.nc .........OK
- Comparing RESTART/fv_tracer.res.tile6.nc .........OK
- Comparing RESTART/sfc_data.tile1.nc .........OK
- Comparing RESTART/sfc_data.tile2.nc .........OK
- Comparing RESTART/sfc_data.tile3.nc .........OK
- Comparing RESTART/sfc_data.tile4.nc .........OK
- Comparing RESTART/sfc_data.tile5.nc .........OK
- Comparing RESTART/sfc_data.tile6.nc .........OK
- Comparing RESTART/phy_data.tile1.nc .........OK
- Comparing RESTART/phy_data.tile2.nc .........OK
- Comparing RESTART/phy_data.tile3.nc .........OK
- Comparing RESTART/phy_data.tile4.nc .........OK
- Comparing RESTART/phy_data.tile5.nc .........OK
- Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 176.063395
-
-Test 045 fv3_ccpp_gfs_v15p2_RRTMGP PASS
-
-
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_RRTMGP_prod
-Checking test 046 fv3_ccpp_gfs_v16_RRTMGP results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_RRTMGP
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_RRTMGP
+Checking test 046 fv3_gfs_v16_RRTMGP results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2663,14 +2539,14 @@ Checking test 046 fv3_ccpp_gfs_v16_RRTMGP results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 176.542941
+The total amount of wall time                        = 170.291390
 
-Test 046 fv3_ccpp_gfs_v16_RRTMGP PASS
+Test 046 fv3_gfs_v16_RRTMGP PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_RRTMGP_c192L127_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_RRTMGP_c192L127_prod
-Checking test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_RRTMGP_c192L127
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_RRTMGP_c192L127
+Checking test 047 fv3_gfs_v16_RRTMGP_c192L127 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -2728,14 +2604,14 @@ Checking test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 718.556767
+The total amount of wall time                        = 714.283719
 
-Test 047 fv3_ccpp_gfs_v16_RRTMGP_c192L127 PASS
+Test 047 fv3_gfs_v16_RRTMGP_c192L127 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_RRTMGP_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_RRTMGP_2thrd_prod
-Checking test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_RRTMGP
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_RRTMGP_2thrd
+Checking test 048 fv3_gfs_v16_RRTMGP_2thrd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2799,14 +2675,14 @@ Checking test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 172.144048
+The total amount of wall time                        = 161.452458
 
-Test 048 fv3_ccpp_gfs_v16_RRTMGP_2thrd PASS
+Test 048 fv3_gfs_v16_RRTMGP_2thrd PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfsv16_csawmg_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfsv16_csawmg_prod
-Checking test 049 fv3_ccpp_gfsv16_csawmg results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfsv16_csawmg
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfsv16_csawmg
+Checking test 049 fv3_gfsv16_csawmg results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2850,14 +2726,14 @@ Checking test 049 fv3_ccpp_gfsv16_csawmg results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 145.900090
+The total amount of wall time                        = 139.130456
 
-Test 049 fv3_ccpp_gfsv16_csawmg PASS
+Test 049 fv3_gfsv16_csawmg PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfsv16_csawmgt_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfsv16_csawmgt_prod
-Checking test 050 fv3_ccpp_gfsv16_csawmgt results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfsv16_csawmgt
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfsv16_csawmgt
+Checking test 050 fv3_gfsv16_csawmgt results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2901,14 +2777,14 @@ Checking test 050 fv3_ccpp_gfsv16_csawmgt results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 162.009408
+The total amount of wall time                        = 136.270951
 
-Test 050 fv3_ccpp_gfsv16_csawmgt PASS
+Test 050 fv3_gfsv16_csawmgt PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gocart_clm_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gocart_clm_prod
-Checking test 051 fv3_ccpp_gocart_clm results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gocart_clm
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gocart_clm
+Checking test 051 fv3_gocart_clm results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -2952,14 +2828,14 @@ Checking test 051 fv3_ccpp_gocart_clm results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 93.182478
+The total amount of wall time                        = 77.083874
 
-Test 051 fv3_ccpp_gocart_clm PASS
+Test 051 fv3_gocart_clm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_flake_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_flake_prod
-Checking test 052 fv3_ccpp_gfs_v16_flake results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_flake
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_flake
+Checking test 052 fv3_gfs_v16_flake results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3023,14 +2899,14 @@ Checking test 052 fv3_ccpp_gfs_v16_flake results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 117.063447
+The total amount of wall time                        = 105.976975
 
-Test 052 fv3_ccpp_gfs_v16_flake PASS
+Test 052 fv3_gfs_v16_flake PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/HAFS_v0_HWRF_thompson_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
-Checking test 053 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/HAFS_v0_HWRF_thompson
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_HAFS_v0_hwrf_thompson
+Checking test 053 fv3_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3094,14 +2970,14 @@ Checking test 053 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 160.487371
+The total amount of wall time                        = 162.377383
 
-Test 053 fv3_ccpp_HAFS_v0_hwrf_thompson PASS
+Test 053 fv3_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/ESG_HAFS_v0_HWRF_thompson_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
-Checking test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/ESG_HAFS_v0_HWRF_thompson
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_esg_HAFS_v0_hwrf_thompson
+Checking test 054 fv3_esg_HAFS_v0_hwrf_thompson results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf012.nc .........OK
@@ -3115,14 +2991,14 @@ Checking test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 301.412646
+The total amount of wall time                        = 351.963836
 
-Test 054 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS
+Test 054 fv3_esg_HAFS_v0_hwrf_thompson PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_ccpp_gfsv16_ugwpv1_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfsv16_ugwpv1_prod
-Checking test 055 fv3_ccpp_gfsv16_ugwpv1 results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfsv16_ugwpv1
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfsv16_ugwpv1
+Checking test 055 fv3_gfsv16_ugwpv1 results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3180,14 +3056,14 @@ Checking test 055 fv3_ccpp_gfsv16_ugwpv1 results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 192.811337
+The total amount of wall time                        = 194.130522
 
-Test 055 fv3_ccpp_gfsv16_ugwpv1 PASS
+Test 055 fv3_gfsv16_ugwpv1 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_ccpp_gfsv16_ugwpv1_warmstart_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfsv16_ugwpv1_warmstart_prod
-Checking test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfsv16_ugwpv1_warmstart
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfsv16_ugwpv1_warmstart
+Checking test 056 fv3_gfsv16_ugwpv1_warmstart results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3245,14 +3121,85 @@ Checking test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 191.702998
+The total amount of wall time                        = 193.636061
 
-Test 056 fv3_ccpp_gfsv16_ugwpv1_warmstart PASS
+Test 056 fv3_gfsv16_ugwpv1_warmstart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v15p2_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v15p2_debug_prod
-Checking test 057 fv3_ccpp_gfs_v15p2_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_ras
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_ras
+Checking test 057 fv3_gfs_v16_ras results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf024.tile1.nc .........OK
+ Comparing phyf024.tile2.nc .........OK
+ Comparing phyf024.tile3.nc .........OK
+ Comparing phyf024.tile4.nc .........OK
+ Comparing phyf024.tile5.nc .........OK
+ Comparing phyf024.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf024.tile1.nc .........OK
+ Comparing dynf024.tile2.nc .........OK
+ Comparing dynf024.tile3.nc .........OK
+ Comparing dynf024.tile4.nc .........OK
+ Comparing dynf024.tile5.nc .........OK
+ Comparing dynf024.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 107.075383
+
+Test 057 fv3_gfs_v16_ras PASS
+
+
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v15p2_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v15p2_debug
+Checking test 058 fv3_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3316,14 +3263,14 @@ Checking test 057 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 211.346801
+The total amount of wall time                        = 207.075769
 
-Test 057 fv3_ccpp_gfs_v15p2_debug PASS
+Test 058 fv3_gfs_v15p2_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_debug_prod
-Checking test 058 fv3_ccpp_gfs_v16_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_debug
+Checking test 059 fv3_gfs_v16_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3387,14 +3334,14 @@ Checking test 058 fv3_ccpp_gfs_v16_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 162.230739
+The total amount of wall time                        = 161.262855
 
-Test 058 fv3_ccpp_gfs_v16_debug PASS
+Test 059 fv3_gfs_v16_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v15p2_RRTMGP_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
-Checking test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v15p2_RRTMGP_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v15p2_RRTMGP_debug
+Checking test 060 fv3_gfs_v15p2_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3458,14 +3405,14 @@ Checking test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 342.379244
+The total amount of wall time                        = 333.313594
 
-Test 059 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS
+Test 060 fv3_gfs_v15p2_RRTMGP_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gfs_v16_RRTMGP_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfs_v16_RRTMGP_debug_prod
-Checking test 060 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_RRTMGP_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_RRTMGP_debug
+Checking test 061 fv3_gfs_v16_RRTMGP_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3529,28 +3476,28 @@ Checking test 060 fv3_ccpp_gfs_v16_RRTMGP_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 350.378805
+The total amount of wall time                        = 340.652034
 
-Test 060 fv3_ccpp_gfs_v16_RRTMGP_debug PASS
+Test 061 fv3_gfs_v16_RRTMGP_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_regional_control_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_regional_control_debug_prod
-Checking test 061 fv3_ccpp_regional_control_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_regional_control_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_regional_control_debug
+Checking test 062 fv3_regional_control_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
  Comparing fv3_history.nc .........OK
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-The total amount of wall time                        = 343.168795
+The total amount of wall time                        = 341.091158
 
-Test 061 fv3_ccpp_regional_control_debug PASS
+Test 062 fv3_regional_control_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_control_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_control_debug_prod
-Checking test 062 fv3_ccpp_control_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_control_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_control_debug
+Checking test 063 fv3_control_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -3576,14 +3523,14 @@ Checking test 062 fv3_ccpp_control_debug results ....
  Comparing dynf006.tile5.nc .........OK
  Comparing dynf006.tile6.nc .........OK
 
-The total amount of wall time                        = 129.611232
+The total amount of wall time                        = 124.095935
 
-Test 062 fv3_ccpp_control_debug PASS
+Test 063 fv3_control_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_stretched_nest_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_stretched_nest_debug_prod
-Checking test 063 fv3_ccpp_stretched_nest_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_stretched_nest_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_stretched_nest_debug
+Checking test 064 fv3_stretched_nest_debug results ....
  Comparing fv3_history2d.nest02.tile7.nc .........OK
  Comparing fv3_history2d.tile1.nc .........OK
  Comparing fv3_history2d.tile2.nc .........OK
@@ -3599,14 +3546,14 @@ Checking test 063 fv3_ccpp_stretched_nest_debug results ....
  Comparing fv3_history.tile5.nc .........OK
  Comparing fv3_history.tile6.nc .........OK
 
-The total amount of wall time                        = 410.472189
+The total amount of wall time                        = 407.127074
 
-Test 063 fv3_ccpp_stretched_nest_debug PASS
+Test 064 fv3_stretched_nest_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gsd_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gsd_debug_prod
-Checking test 064 fv3_ccpp_gsd_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gsd_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gsd_debug
+Checking test 065 fv3_gsd_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3670,14 +3617,14 @@ Checking test 064 fv3_ccpp_gsd_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 197.373577
+The total amount of wall time                        = 190.071342
 
-Test 064 fv3_ccpp_gsd_debug PASS
+Test 065 fv3_gsd_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_gsd_diag3d_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gsd_diag3d_debug_prod
-Checking test 065 fv3_ccpp_gsd_diag3d_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gsd_diag3d_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gsd_diag3d_debug
+Checking test 066 fv3_gsd_diag3d_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3741,14 +3688,14 @@ Checking test 065 fv3_ccpp_gsd_diag3d_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 230.638613
+The total amount of wall time                        = 218.845830
 
-Test 065 fv3_ccpp_gsd_diag3d_debug PASS
+Test 066 fv3_gsd_diag3d_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_thompson_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_thompson_debug_prod
-Checking test 066 fv3_ccpp_thompson_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_thompson_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_thompson_debug
+Checking test 067 fv3_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3812,14 +3759,14 @@ Checking test 066 fv3_ccpp_thompson_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 322.695953
+The total amount of wall time                        = 320.590012
 
-Test 066 fv3_ccpp_thompson_debug PASS
+Test 067 fv3_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_thompson_no_aero_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_thompson_no_aero_debug_prod
-Checking test 067 fv3_ccpp_thompson_no_aero_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_thompson_no_aero_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_thompson_no_aero_debug
+Checking test 068 fv3_thompson_no_aero_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3883,14 +3830,14 @@ Checking test 067 fv3_ccpp_thompson_no_aero_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 310.005248
+The total amount of wall time                        = 307.651853
 
-Test 067 fv3_ccpp_thompson_no_aero_debug PASS
+Test 068 fv3_thompson_no_aero_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_rrfs_v1beta_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_rrfs_v1beta_debug_prod
-Checking test 068 fv3_ccpp_rrfs_v1beta_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_rrfs_v1beta_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_rrfs_v1beta_debug
+Checking test 069 fv3_rrfs_v1beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -3954,14 +3901,14 @@ Checking test 068 fv3_ccpp_rrfs_v1beta_debug results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 190.089158
+The total amount of wall time                        = 187.461681
 
-Test 068 fv3_ccpp_rrfs_v1beta_debug PASS
+Test 069 fv3_rrfs_v1beta_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/HAFS_v0_HWRF_thompson_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_HAFS_v0_hwrf_thompson_debug
+Checking test 070 fv3_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
  Comparing atmos_4xdaily.tile3.nc .........OK
@@ -4025,14 +3972,14 @@ Checking test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 185.737524
+The total amount of wall time                        = 189.957662
 
-Test 069 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS
+Test 070 fv3_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
-Checking test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/ESG_HAFS_v0_HWRF_thompson_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_esg_HAFS_v0_hwrf_thompson_debug
+Checking test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
@@ -4046,14 +3993,14 @@ Checking test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
  Comparing RESTART/sfc_data.nc .........OK
  Comparing RESTART/phy_data.nc .........OK
 
-The total amount of wall time                        = 354.356825
+The total amount of wall time                        = 348.270535
 
-Test 070 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS
+Test 071 fv3_esg_HAFS_v0_hwrf_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210309/fv3_ccpp_gfsv16_ugwpv1_debug_ccpp
-working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_10849/fv3_ccpp_gfsv16_ugwpv1_debug_prod
-Checking test 071 fv3_ccpp_gfsv16_ugwpv1_debug results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfsv16_ugwpv1_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfsv16_ugwpv1_debug
+Checking test 072 fv3_gfsv16_ugwpv1_debug results ....
  Comparing phyf000.tile1.nc .........OK
  Comparing phyf000.tile2.nc .........OK
  Comparing phyf000.tile3.nc .........OK
@@ -4111,11 +4058,87 @@ Checking test 071 fv3_ccpp_gfsv16_ugwpv1_debug results ....
  Comparing RESTART/phy_data.tile5.nc .........OK
  Comparing RESTART/phy_data.tile6.nc .........OK
 
-The total amount of wall time                        = 538.833850
+The total amount of wall time                        = 539.522156
+
+Test 072 fv3_gfsv16_ugwpv1_debug PASS
+
+
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20210318/fv3_gfs_v16_ras_debug
+working dir  = /gpfs/hps3/stmp/Minsuk.Ji/FV3_RT/rt_41244/fv3_gfs_v16_ras_debug
+Checking test 073 fv3_gfs_v16_ras_debug results ....
+ Comparing atmos_4xdaily.tile1.nc .........OK
+ Comparing atmos_4xdaily.tile2.nc .........OK
+ Comparing atmos_4xdaily.tile3.nc .........OK
+ Comparing atmos_4xdaily.tile4.nc .........OK
+ Comparing atmos_4xdaily.tile5.nc .........OK
+ Comparing atmos_4xdaily.tile6.nc .........OK
+ Comparing phyf000.tile1.nc .........OK
+ Comparing phyf000.tile2.nc .........OK
+ Comparing phyf000.tile3.nc .........OK
+ Comparing phyf000.tile4.nc .........OK
+ Comparing phyf000.tile5.nc .........OK
+ Comparing phyf000.tile6.nc .........OK
+ Comparing phyf006.tile1.nc .........OK
+ Comparing phyf006.tile2.nc .........OK
+ Comparing phyf006.tile3.nc .........OK
+ Comparing phyf006.tile4.nc .........OK
+ Comparing phyf006.tile5.nc .........OK
+ Comparing phyf006.tile6.nc .........OK
+ Comparing dynf000.tile1.nc .........OK
+ Comparing dynf000.tile2.nc .........OK
+ Comparing dynf000.tile3.nc .........OK
+ Comparing dynf000.tile4.nc .........OK
+ Comparing dynf000.tile5.nc .........OK
+ Comparing dynf000.tile6.nc .........OK
+ Comparing dynf006.tile1.nc .........OK
+ Comparing dynf006.tile2.nc .........OK
+ Comparing dynf006.tile3.nc .........OK
+ Comparing dynf006.tile4.nc .........OK
+ Comparing dynf006.tile5.nc .........OK
+ Comparing dynf006.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+
+The total amount of wall time                        = 300.749507
 
-Test 071 fv3_ccpp_gfsv16_ugwpv1_debug PASS
+Test 073 fv3_gfs_v16_ras_debug PASS
 
+FAILED TESTS: 
+Test fv3_gfs_v15p2 041 failed failed 
+Test fv3_gfs_v15p2 041 failed in run_test failed 
+Test fv3_gfs_v15p2_RRTMGP 045 failed failed 
+Test fv3_gfs_v15p2_RRTMGP 045 failed in run_test failed 
 
-REGRESSION TEST WAS SUCCESSFUL
-Mon Mar 15 15:58:20 UTC 2021
-Elapsed time: 00h:47m:47s. Have a nice day!
+REGRESSION TEST FAILED
+Tue Mar 23 19:44:35 UTC 2021
+Elapsed time: 00h:43m:03s. Have a nice day!
diff --git a/tests/compile.sh b/tests/compile.sh
index 96b847e7c7..0ca68416ef 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -81,13 +81,13 @@ echo "Compiling ${MAKE_OPT} into $BUILD_NAME.exe on $MACHINE_ID"
 CMAKE_FLAGS=''
 
 if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
-  CMAKE_FLAGS="${CMAKE_FLAGS} -DDEBUG=Y"
+  CMAKE_FLAGS="${CMAKE_FLAGS} -DDEBUG=ON"
 elif [[ "${MAKE_OPT}" == *"REPRO=Y"* ]]; then
-  CMAKE_FLAGS="${CMAKE_FLAGS} -DREPRO=Y"
+  CMAKE_FLAGS="${CMAKE_FLAGS} -DREPRO=ON"
 fi
 
 if [[ "${MAKE_OPT}" == *"32BIT=Y"* ]]; then
-  CMAKE_FLAGS="${CMAKE_FLAGS} -D32BIT=Y"
+  CMAKE_FLAGS="${CMAKE_FLAGS} -D32BIT=ON"
 fi
 
 if [[ "${MAKE_OPT}" == *"OPENMP=N"* ]]; then
@@ -131,20 +131,30 @@ if [[ $? -eq 0 ]]; then
 fi
 set -ex
 
-if [[ "${MAKE_OPT}" == *"WW3=Y"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DWW3=Y"
+# Valid applications
+if [[ "${MAKE_OPT}" == *"APP=ATM"* ]]; then
+    echo "MAKE_OPT = ${MAKE_OPT}"
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=ATM"
 fi
 
-if [[ "${MAKE_OPT}" == *"S2S=Y"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DS2S=Y"
+if [[ "${MAKE_OPT}" == *"APP=ATMW"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=ATMW"
 fi
 
-if [[ "${MAKE_OPT}" == *"DATM=Y"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DDATM=Y"
+if [[ "${MAKE_OPT}" == *"APP=S2S"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=S2S -DMOM6SOLO=ON"
 fi
 
-if [[ "${MAKE_OPT}" == *"S2S=Y"* ]] || [[ ${MAKE_OPT} == *"DATM=Y"* ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} -DMOM6SOLO=ON"
+if [[ "${MAKE_OPT}" == *"APP=S2SW"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=S2SW -DMOM6SOLO=ON"
+fi
+
+if [[ "${MAKE_OPT}" == *"APP=DATM"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM"
+fi
+
+if [[ "${MAKE_OPT}" == *"APP=DATM_NEMS"* ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DAPP=DATM_NEMS"
 fi
 
 CMAKE_FLAGS=$(trim "${CMAKE_FLAGS}")
@@ -174,3 +184,4 @@ fi
 
 elapsed=$SECONDS
 echo "Elapsed time $elapsed seconds. Compiling ${MAKE_OPT} finished"
+echo "Compile $COMPILE_NR elapsed time $elapsed seconds. ${MAKE_OPT}" >> ${LOG_DIR}/compile_${COMPILE_NR}_time.log
diff --git a/tests/fv3_conf/compile_bsub.IN_wcoss_cray b/tests/fv3_conf/compile_bsub.IN_wcoss_cray
index 6b7ae0bbec..e9e76d1fe8 100644
--- a/tests/fv3_conf/compile_bsub.IN_wcoss_cray
+++ b/tests/fv3_conf/compile_bsub.IN_wcoss_cray
@@ -16,8 +16,10 @@ module load alps
 module list
 set -x
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 aprun -n 1 -j 1 -N 1 -d 24 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3 b/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3
index a40f697104..9bdb0713c7 100644
--- a/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3
+++ b/tests/fv3_conf/compile_bsub.IN_wcoss_dell_p3
@@ -12,8 +12,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_qsub.IN_cheyenne b/tests/fv3_conf/compile_qsub.IN_cheyenne
index 9d438efdf3..03feac1e69 100644
--- a/tests/fv3_conf/compile_qsub.IN_cheyenne
+++ b/tests/fv3_conf/compile_qsub.IN_cheyenne
@@ -9,8 +9,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_qsub.IN_wcoss2 b/tests/fv3_conf/compile_qsub.IN_wcoss2
index ee2b789758..9bd9e1e667 100644
--- a/tests/fv3_conf/compile_qsub.IN_wcoss2
+++ b/tests/fv3_conf/compile_qsub.IN_wcoss2
@@ -13,8 +13,10 @@ set -eux
 cd $PBS_O_WORKDIR
 export CRAY_CONFIG_DIR=$HOME
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_slurm.IN_gaea b/tests/fv3_conf/compile_slurm.IN_gaea
index f5051b92a6..2071d4b00f 100644
--- a/tests/fv3_conf/compile_slurm.IN_gaea
+++ b/tests/fv3_conf/compile_slurm.IN_gaea
@@ -11,8 +11,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_slurm.IN_hera b/tests/fv3_conf/compile_slurm.IN_hera
index 45fdbbe389..2bab9972bb 100644
--- a/tests/fv3_conf/compile_slurm.IN_hera
+++ b/tests/fv3_conf/compile_slurm.IN_hera
@@ -10,8 +10,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_slurm.IN_jet b/tests/fv3_conf/compile_slurm.IN_jet
index dc1b29c538..a04541d66e 100644
--- a/tests/fv3_conf/compile_slurm.IN_jet
+++ b/tests/fv3_conf/compile_slurm.IN_jet
@@ -11,8 +11,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/compile_slurm.IN_orion b/tests/fv3_conf/compile_slurm.IN_orion
index 6d8bdeb8b9..f100c8121d 100644
--- a/tests/fv3_conf/compile_slurm.IN_orion
+++ b/tests/fv3_conf/compile_slurm.IN_orion
@@ -11,8 +11,10 @@
 
 set -eux
 
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 echo "Compile started:  " `date`
 
 @[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR]
 
 echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_bsub.IN_wcoss_cray b/tests/fv3_conf/fv3_bsub.IN_wcoss_cray
index 81359cca4f..424ecc989d 100644
--- a/tests/fv3_conf/fv3_bsub.IN_wcoss_cray
+++ b/tests/fv3_conf/fv3_bsub.IN_wcoss_cray
@@ -10,6 +10,7 @@
 #BSUB -M 500
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -28,5 +29,4 @@ export KMP_AFFINITY=disabled
 aprun -j 1 -n @[TASKS] -N @[TPN] -d @[THRD] -cc depth ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3 b/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3
index 0079469187..d28f04265e 100644
--- a/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3
+++ b/tests/fv3_conf/fv3_bsub.IN_wcoss_dell_p3
@@ -11,6 +11,7 @@
 #BSUB -R affinity[core(@[THRD])]
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -28,5 +29,4 @@ export I_MPI_DEBUG=4
 mpirun -l -n @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_msub.IN b/tests/fv3_conf/fv3_msub.IN
deleted file mode 100644
index cdce1e094f..0000000000
--- a/tests/fv3_conf/fv3_msub.IN
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -l
-#PBS -S /bin/bash
-#PBS -o out
-#PBS -e err
-#PBS -N @[JBNME]
-#PBS -A @[ACCNR]
-#PBS -q @[QUEUE]
-#PBS -d .
-#PBS -l partition=@[PARTITION]
-#PBS -l size=@[NODES]
-#PBS -l walltime=00:@[WLCLK]:00
-
-set -ux
-
-set +x
-module use $( pwd -P )
-module load modules.fv3
-set -x
-module list
-
-echo "Model started:  " `date`
-
-export OMP_NUM_THREADS=@[THRD]
-export OMP_STACKSIZE=1024M
-export NC_BLKSZ=1M
-
-aprun -n @[TASKS] -d@[THRD] -j1 ./fv3.exe
-
-echo "Model ended:    " `date`
-
-exit
diff --git a/tests/fv3_conf/fv3_qsub.IN_cheyenne b/tests/fv3_conf/fv3_qsub.IN_cheyenne
index f3476d9b3b..9a651df675 100644
--- a/tests/fv3_conf/fv3_qsub.IN_cheyenne
+++ b/tests/fv3_conf/fv3_qsub.IN_cheyenne
@@ -8,6 +8,7 @@
 #PBS -l walltime=00:@[WLCLK]:00
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -30,5 +31,4 @@ sync && sleep 1
 mpiexec_mpt -np @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_qsub.IN_wcoss2 b/tests/fv3_conf/fv3_qsub.IN_wcoss2
index d000b7e493..2316551603 100644
--- a/tests/fv3_conf/fv3_qsub.IN_wcoss2
+++ b/tests/fv3_conf/fv3_qsub.IN_wcoss2
@@ -9,6 +9,7 @@
 #PBS -l walltime=00:@[WLCLK]:00
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 cd $PBS_O_WORKDIR
 export CRAY_CONFIG_DIR=$HOME
@@ -28,5 +29,4 @@ export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 cray aprun -n @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_slurm.IN_gaea b/tests/fv3_conf/fv3_slurm.IN_gaea
index ada92b658d..fcadd8c8dc 100644
--- a/tests/fv3_conf/fv3_slurm.IN_gaea
+++ b/tests/fv3_conf/fv3_slurm.IN_gaea
@@ -8,7 +8,8 @@
 #SBATCH --ntasks=@[TASKS]
 #SBATCH --time=@[WLCLK]
 
-set -ux
+set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -30,5 +31,4 @@ sync && sleep 1
 srun ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_slurm.IN_hera b/tests/fv3_conf/fv3_slurm.IN_hera
index 6c48bb4f64..c8c12d041c 100644
--- a/tests/fv3_conf/fv3_slurm.IN_hera
+++ b/tests/fv3_conf/fv3_slurm.IN_hera
@@ -11,6 +11,7 @@
 ### #SBATCH --exclusive
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -35,5 +36,4 @@ sync && sleep 1
 srun --label -n @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_slurm.IN_jet b/tests/fv3_conf/fv3_slurm.IN_jet
index d44012ed11..bb7fb42a36 100644
--- a/tests/fv3_conf/fv3_slurm.IN_jet
+++ b/tests/fv3_conf/fv3_slurm.IN_jet
@@ -10,6 +10,7 @@
 ### #SBATCH --exclusive
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -34,5 +35,4 @@ sync && sleep 1
 srun ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_slurm.IN_orion b/tests/fv3_conf/fv3_slurm.IN_orion
index d1c142f513..857550fb30 100644
--- a/tests/fv3_conf/fv3_slurm.IN_orion
+++ b/tests/fv3_conf/fv3_slurm.IN_orion
@@ -12,6 +12,7 @@
 #SBATCH --exclusive
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -39,5 +40,4 @@ sync && sleep 1
 srun --label -n @[TASKS] ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/fv3_conf/fv3_slurm.IN_stampede b/tests/fv3_conf/fv3_slurm.IN_stampede
index 59fe5a87f7..1c81669128 100644
--- a/tests/fv3_conf/fv3_slurm.IN_stampede
+++ b/tests/fv3_conf/fv3_slurm.IN_stampede
@@ -1,13 +1,14 @@
 #!/bin/bash -l
 #SBATCH -o out
 #SBATCH -e err
-#SBATCH -N 4
+#SBATCH -N @[NODES]
 #SBATCH -A @[ACCNR]
-#SBATCH -p skx-dev
+#SBATCH -p @[QUEUE]
 #SBATCH -n @[TASKS]
 #SBATCH -t 00:@[WLCLK]:00
 
 set -eux
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 set +x
 source ./module-setup.sh
@@ -32,5 +33,4 @@ export LD_BIND_NOW=1
 ibrun   ./fv3.exe
 
 echo "Model ended:    " `date`
-
-exit
+echo -n " $( date +%s )," >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
diff --git a/tests/rt.conf b/tests/rt.conf
index c1669c361e..3a39fd4416 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -2,7 +2,7 @@
 # PROD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017                                                                                                     |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017                                                                                             |                                         | fv3 |
 
 RUN     | fv3_control                                                                                                             |                                         | fv3 |
 RUN     | fv3_decomp                                                                                                              | - jet.intel                             |     |
@@ -23,21 +23,21 @@ RUN     | fv3_iau
 RUN     | fv3_lheatstrg                                                                                                           |                                         | fv3 |
 
 # WW3 not working on Cheyenne in the past, need to check if it works now
-COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y                                                                           | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
+COMPILE | APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp                                                                        | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
 RUN     | fv3_gfdlmprad                                                                                                           | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
 RUN     | fv3_gfdlmprad_atmwav                                                                                                    | + wcoss_dell_p3 hera.intel orion.intel  | fv3 |
 RUN     | fv3_wrtGauss_nemsio_c768                                                                                                | +               hera.intel orion.intel  | fv3 |
 
 # Run multigases test in REPRO mode to avoid numerical instability in the deep atmosphere
-COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y                                                                |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y                                                        |                                         | fv3 |
 RUN     | fv3_multigases                                                                                                          |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y                                                                      |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y                                                              |                                         | fv3 |
 RUN     | fv3_control_32bit                                                                                                       |                                         | fv3 |
 RUN     | fv3_stretched                                                                                                           |                                         | fv3 |
 RUN     | fv3_stretched_nest                                                                                                      |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y                                                                                |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn 32BIT=Y                                                                        |                                         | fv3 |
 RUN     | fv3_regional_control                                                                                                    |                                         | fv3 |
 RUN     | fv3_regional_restart                                                                                                    |                                         | fv3 | fv3_regional_control
 RUN     | fv3_regional_quilt                                                                                                      |                                         | fv3 |
@@ -49,19 +49,19 @@ RUN     | fv3_regional_quilt_netcdf_parallel
 #RUN     | fv3_regional_c768                                                                                                      | jet.intel                               | fv3 |
 #RUN     | fv3_regional_c768                                                                                                      | orion.intel                             | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                                   |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp                                                           |                                         | fv3 |
 RUN     | fv3_gfdlmp                                                                                                              |                                         | fv3 |
 RUN     | fv3_gfdlmprad_gwd                                                                                                       |                                         | fv3 |
 RUN     | fv3_gfdlmprad_noahmp                                                                                                    |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                         |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf,FV3_GFS_2017_satmedmfq                 |                                         | fv3 |
 #RUN     | fv3_csawmgshoc                                                                                                         |                                         | fv3 |
 #RUN     | fv3_csawmg3shoc127                                                                                                     |                                         | fv3 |
 RUN     | fv3_csawmg                                                                                                              |                                         | fv3 |
 RUN     | fv3_satmedmf                                                                                                            |                                         | fv3 |
 RUN     | fv3_satmedmfq                                                                                                           |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y          |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y  |                                         | fv3 |
 RUN     | fv3_gfdlmp_32bit                                                                                                        |                                         | fv3 |
 RUN     | fv3_gfdlmprad_32bit_post                                                                                                |                                         | fv3 |
 RUN     | fv3_cpt                                                                                                                 |                                         | fv3 |
@@ -74,7 +74,7 @@ RUN     | fv3_thompson_no_aero
 # This test crashes with NaNs on jet.intel
 RUN     | fv3_rrfs_v1beta                                                                                                         | - jet.intel                             | fv3 |
 
-COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                                                |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                                        |                                         | fv3 |
 # fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
 RUN     | fv3_gfs_v15p2                                                                                                           | - cheyenne.intel                        | fv3 |
 RUN     | fv3_gfs_v16                                                                                                             |                                         | fv3 |
@@ -85,16 +85,16 @@ RUN     | fv3_gfs_v16_RRTMGP
 RUN     | fv3_gfs_v16_RRTMGP_c192L127                                                                                             |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_2thrd                                                                                                |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_v16_csawmg                                                                                               |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_v16_csawmg                                                                                       |                                         | fv3 |
 # fv3_gfsv16_csawmg crashes with a "bus error" on cheyenne.intel, turn off both tests
 RUN     | fv3_gfsv16_csawmg                                                                                                       | - cheyenne.intel                        | fv3 |
 RUN     | fv3_gfsv16_csawmgt                                                                                                      | - cheyenne.intel                        | fv3 |
 
-COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake                                                 |                                         | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake                                         |                                         | fv3 |
 RUN     | fv3_gocart_clm                                                                                                          |                                         | fv3 |
 RUN     | fv3_gfs_v16_flake                                                                                                       |                                         | fv3 |
 
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                           |                                         | fv3 |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                   |                                         | fv3 |
 RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                                         | fv3 |
 #RUN     | fv3_HAFS_v0_hwrf                                                                                                       |                                         | fv3 |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                                         | fv3 |
@@ -106,13 +106,13 @@ RUN     | fv3_gfs_v16_ras
 # DEBUG tests                                                                                                                                                                     #
 ###################################################################################################################################################################################
 
-COMPILE | DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                        |                                         | fv3 |
+COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP                                |                                         | fv3 |
 RUN     | fv3_gfs_v15p2_debug                                                                                                     |                                         | fv3 |
 RUN     | fv3_gfs_v16_debug                                                                                                       |                                         | fv3 |
 RUN     | fv3_gfs_v15p2_RRTMGP_debug                                                                                              |                                         | fv3 |
 RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                                         | fv3 |
 
-COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y |                            | fv3 |
+COMPILE | APP=ATM SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y |                      | fv3 |
 RUN     | fv3_regional_control_debug                                                                                              |                                         | fv3 |
 RUN     | fv3_control_debug                                                                                                       |                                         | fv3 |
 RUN     | fv3_stretched_nest_debug                                                                                                |                                         | fv3 |
@@ -122,7 +122,7 @@ RUN     | fv3_thompson_debug
 RUN     | fv3_thompson_no_aero_debug                                                                                              |                                         | fv3 |
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                                         | fv3 |
 
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                                   |                                         | fv3 |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                           |                                         | fv3 |
 RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                                         | fv3 |
 #RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                 |                                         | fv3 |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                                         | fv3 |
@@ -133,7 +133,7 @@ RUN     | fv3_gfs_v16_ras_debug
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y               | - wcoss_cray jet.intel                  | fv3 |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled             | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_control                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray jet.intel                  |     | cpld_control
 RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray jet.intel                  | fv3 |
@@ -165,13 +165,13 @@ RUN     | cpld_restart_bmarkfrac
 RUN     | cpld_bmarkfrac_v16                                                                                                      | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restart_bmarkfrac_v16                                                                                              | - wcoss_cray gaea.intel jet.intel       |     | cpld_bmarkfrac_v16
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y WW3=Y         | - wcoss_cray gaea.intel jet.intel       | fv3 |
+COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled            | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_bmark_wave                                                                                                         | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_bmarkfrac_wave                                                                                                     | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_bmarkfrac_wave_v16                                                                                                 | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_control_wave                                                                                                       | - wcoss_cray gaea.intel jet.intel       | fv3 |
 
-COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y       | - wcoss_cray jet.intel                  | fv3 |
+COMPILE | APP=S2S DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled     | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_debug                                                                                                              | - wcoss_cray jet.intel                  | fv3 |
 RUN     | cpld_debugfrac                                                                                                          | - wcoss_cray jet.intel                  | fv3 |
 
@@ -179,7 +179,7 @@ RUN     | cpld_debugfrac
 # Data Atmosphere tests                                                                                                                                                           #
 ###################################################################################################################################################################################
 
-COMPILE | DATM=Y S2S=Y                                                                                                            | - wcoss_cray jet.intel                  | fv3 |
+COMPILE | APP=DATM_NEMS                                                                                                           | - wcoss_cray jet.intel                  | fv3 |
 RUN     | datm_control_cfsr                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
 RUN     | datm_restart_cfsr                                                                                                       | - wcoss_cray jet.intel                  |     | datm_control_cfsr
 RUN     | datm_control_gefs                                                                                                       | - wcoss_cray jet.intel                  | fv3 |
@@ -190,5 +190,5 @@ RUN     | datm_bulk_gefs
 RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray jet.intel gaea.intel       | fv3 |
 RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray jet.intel                  | fv3 |
 
-COMPILE | DATM=Y S2S=Y DEBUG=Y                                                                                                    | - wcoss_cray jet.intel                  | fv3 |
+COMPILE | APP=DATM_NEMS DEBUG=Y                                                                                                   | - wcoss_cray jet.intel                  | fv3 |
 RUN     | datm_debug_cfsr                                                                                                         | - wcoss_cray jet.intel                  | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
index 5a892accb0..fa245cf8fe 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -327,11 +327,12 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
 
   export PYTHONPATH=
   ECFLOW_START=
-  QUEUE=skx-dev
+  QUEUE=skx-normal
   COMPILE_QUEUE=skx-dev
   PARTITION=
-  dprefix=$WORK/ufs-weather-model/run
-  DISKNM=$WORK/ufs-weather-model/RT
+  ACCNR=TG-EES200015
+  dprefix=$SCRATCH/ufs-weather-model/run
+  DISKNM=/work/07736/minsukji/stampede2/ufs-weather-model/RT
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=slurm
@@ -435,7 +436,6 @@ if [[ $CREATE_BASELINE == true ]]; then
   mkdir -p "${NEW_BASELINE}"
 fi
 
-COMPILE_LOG=${PATHRT}/Compile_$MACHINE_ID.log
 REGRESSIONTEST_LOG=${PATHRT}/RegressionTests_$MACHINE_ID.log
 
 date > ${REGRESSIONTEST_LOG}
@@ -444,12 +444,13 @@ echo                         >> ${REGRESSIONTEST_LOG}
 
 source default_vars.sh
 
+JOB_NR=0
 TEST_NR=0
 COMPILE_NR=0
 COMPILE_PREV_WW3_NR=''
 rm -f fail_test
 
-LOG_DIR=${PATHRT}/log_$MACHINE_ID
+export LOG_DIR=${PATHRT}/log_$MACHINE_ID
 rm -rf ${LOG_DIR}
 mkdir ${LOG_DIR}
 
@@ -529,8 +530,7 @@ if [[ $ECFLOW == true ]]; then
   rm -rf ${ECFLOW_RUN}
   mkdir -p ${ECFLOW_RUN}/${ECFLOW_SUITE}
   cp head.h tail.h ${ECFLOW_RUN}
-  > ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
-  cat << EOF >> ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
+  cat << EOF > ${ECFLOW_RUN}/${ECFLOW_SUITE}.def
 suite ${ECFLOW_SUITE}
     edit ECF_HOME '${ECFLOW_RUN}'
     edit ECF_INCLUDE '${ECFLOW_RUN}'
@@ -582,6 +582,8 @@ while read -r line || [ "$line" ]; do
   [[ ${#line} == 0 ]] && continue
   [[ $line == \#* ]] && continue
 
+  JOB_NR=$( printf '%03d' $(( 10#$JOB_NR + 1 )) )
+
   if [[ $line == COMPILE* ]] ; then
 
     MAKE_OPT=$(echo $line | cut -d'|' -f2 | sed -e 's/^ *//' -e 's/ *$//')
@@ -601,9 +603,11 @@ while read -r line || [ "$line" ]; do
       fi
     fi
 
-    (( COMPILE_NR += 1 ))
+    export COMPILE_NR=$( printf '%03d' $(( 10#$COMPILE_NR + 1 )) )
 
     cat << EOF > ${RUNDIR_ROOT}/compile_${COMPILE_NR}.env
+    export JOB_NR=${JOB_NR}
+    export COMPILE_NR=${COMPILE_NR}
     export MACHINE_ID=${MACHINE_ID}
     export RT_COMPILER=${RT_COMPILER}
     export PATHRT=${PATHRT}
@@ -697,6 +701,7 @@ EOF
       fi
 
       cat << EOF > ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
+      export JOB_NR=${JOB_NR}
       export MACHINE_ID=${MACHINE_ID}
       export RT_COMPILER=${RT_COMPILER}
       export RTPWD=${RTPWD}
@@ -758,7 +763,7 @@ fi
 ## regression test is either failed or successful
 ##
 set +e
-cat ${LOG_DIR}/compile_*.log                   >  ${COMPILE_LOG}
+cat ${LOG_DIR}/compile_*_time.log              >> ${REGRESSIONTEST_LOG}
 cat ${LOG_DIR}/rt_*.log                        >> ${REGRESSIONTEST_LOG}
 if [[ -e fail_test ]]; then
   echo "FAILED TESTS: "
@@ -783,6 +788,6 @@ fi
 
 date >> ${REGRESSIONTEST_LOG}
 
-elapsed_time=$( printf '%02dh:%02dm:%02ds\n' $(($SECONDS%86400/3600)) $(($SECONDS%3600/60)) $(($SECONDS%60)) )
+elapsed_time=$( printf '%02dh:%02dm:%02ds\n' $((SECONDS%86400/3600)) $((SECONDS%3600/60)) $((SECONDS%60)) )
 echo "Elapsed time: ${elapsed_time}. Have a nice day!" >> ${REGRESSIONTEST_LOG}
 echo "Elapsed time: ${elapsed_time}. Have a nice day!"
diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
index 9397d51c46..42eb3b230c 100644
--- a/tests/rt_35d.conf
+++ b/tests/rt_35d.conf
@@ -1,4 +1,4 @@
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y                               | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                             | + hera.intel orion.intel | fv3 |  |
 RUN     | cpld_bmark_35d                                                                                                      |                          | fv3 |  | 2012010100
 RUN     | cpld_bmark_35d                                                                                                      |                          | fv3 |  | 2012040100
 RUN     | cpld_bmark_35d                                                                                                      |                          | fv3 |  | 2012070100
@@ -8,7 +8,7 @@ RUN     | cpld_bmark_35d
 RUN     | cpld_bmark_35d                                                                                                      |                          | fv3 |  | 2013070100
 RUN     | cpld_bmark_35d                                                                                                      |                          | fv3 |  | 2013100100
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y                         | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                            | + hera.intel orion.intel | fv3 |  |
 RUN     | cpld_bmark_wave_35d                                                                                                 |                          | fv3 |  | 2012010100
 RUN     | cpld_bmark_wave_35d                                                                                                 |                          | fv3 |  | 2012040100
 RUN     | cpld_bmark_wave_35d                                                                                                 |                          | fv3 |  | 2012070100
@@ -18,7 +18,7 @@ RUN     | cpld_bmark_wave_35d
 RUN     | cpld_bmark_wave_35d                                                                                                 |                          | fv3 |  | 2013070100
 RUN     | cpld_bmark_wave_35d                                                                                                 |                          | fv3 |  | 2013100100
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y                               | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                             | + hera.intel orion.intel | fv3 |  |
 RUN     | cpld_bmarkfrac_35d                                                                                                  |                          | fv3 |  | 2012010100
 RUN     | cpld_bmarkfrac_35d                                                                                                  |                          | fv3 |  | 2012040100
 RUN     | cpld_bmarkfrac_35d                                                                                                  |                          | fv3 |  | 2012070100
@@ -28,7 +28,7 @@ RUN     | cpld_bmarkfrac_35d
 RUN     | cpld_bmarkfrac_35d                                                                                                  |                          | fv3 |  | 2013070100
 RUN     | cpld_bmarkfrac_35d                                                                                                  |                          | fv3 |  | 2013100100
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y                         | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                            | + hera.intel orion.intel | fv3 |  |
 RUN     | cpld_bmarkfrac_wave_35d                                                                                             |                          | fv3 |  | 2012010100
 RUN     | cpld_bmarkfrac_wave_35d                                                                                             |                          | fv3 |  | 2012040100
 RUN     | cpld_bmarkfrac_wave_35d                                                                                             |                          | fv3 |  | 2012070100
@@ -38,7 +38,7 @@ RUN     | cpld_bmarkfrac_wave_35d
 RUN     | cpld_bmarkfrac_wave_35d                                                                                             |                          | fv3 |  | 2013070100
 RUN     | cpld_bmarkfrac_wave_35d                                                                                             |                          | fv3 |  | 2013100100
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled S2S=Y WW3=Y     | + hera.intel orion.intel | fv3 |  |
+COMPILE | APP=S2SW SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16_coupled        | + hera.intel orion.intel | fv3 |  |
 RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012010100
 RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012040100
 RUN     | cpld_bmarkfrac_wave_v16_35d                                                                                         |                          | fv3 |  | 2012070100
diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf
index 562022cb6f..fd61d05ed3 100644
--- a/tests/rt_ccpp_dev.conf
+++ b/tests/rt_ccpp_dev.conf
@@ -4,7 +4,7 @@
 # CCPP REPRO tests                                                                                                                                         #
 ############################################################################################################################################################
 
-COMPILE | REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah                          |                | fv3         |
+COMPILE | APP=ATM REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah                  |                | fv3         |
 
 RUN     | fv3_ccpp_thompson_mynn                                                                                            |                | fv3         |
 RUN     | fv3_ccpp_gf_thompson                                                                                              |                | fv3         |
@@ -15,12 +15,12 @@ RUN     | fv3_ccpp_gsd_lndp
 RUN     | fv3_ccpp_gsd_noah                                                                                                 |                | fv3         |
 RUN     | fv3_ccpp_gsd_noah_lndp                                                                                            |                | fv3         |
 
-COMPILE | REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc                                                            |                | fv3         |
+COMPILE | APP=ATM REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc                                                    |                | fv3         |
 
 RUN     | fv3_ccpp_gsd_mynnsfc                                                                                              |                | fv3         |
 RUN     | fv3_ccpp_gsd_noah_mynnsfc                                                                                         |                | fv3         |
 
-COMPILE | REPRO=Y SUITES=FV3_GFS_v16_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR                                   |                | fv3         |
+COMPILE | APP=ATM REPRO=Y SUITES=FV3_GFS_v16_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR                           |                | fv3         |
 
 RUN     | fv3_ccpp_thompson                                                                                                 |                | fv3         |
 RUN     | fv3_ccpp_thompson_no_aero                                                                                         |                | fv3         |
@@ -28,7 +28,7 @@ RUN     | fv3_ccpp_gf
 RUN     | fv3_ccpp_mynn                                                                                                     |                | fv3         |
 RUN     | fv3_ccpp_gsd_sar                                                                                                  |                | fv3         |
 
-COMPILE | REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_GSD_v0_unified_ugwp_suite,FV3_RAP,FV3_HRRR                               |                | fv3         |
+COMPILE | APP=ATM REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_GSD_v0_unified_ugwp_suite,FV3_RAP,FV3_HRRR                       |                | fv3         |
 RUN     | fv3_ccpp_gsd_drag_suite                                                                                           |                | fv3         |
 RUN     | fv3_ccpp_gsd_unified_ugwp                                                                                         |                |             |
 RUN     | fv3_ccpp_gsd_drag_suite_unified_ugwp                                                                              |                |             |
@@ -36,7 +36,7 @@ RUN     | fv3_ccpp_rap
 RUN     | fv3_ccpp_hrrr                                                                                                     |                | fv3         |
 
 # Compile without suite argument for CAPS physics
-COMPILE | REPRO=Y                                                                                                           |                | fv3         |
+COMPILE | APP=ATM REPRO=Y                                                                                                   |                | fv3         |
 # Run tests
 RUN     | fv3_ccpp_shinhong                                                                                                 |                | fv3         |
 RUN     | fv3_ccpp_ysu                                                                                                      |                | fv3         |
@@ -46,7 +46,7 @@ RUN     | fv3_ccpp_ntiedtke
 # CCPP DEBUG tests                                                                                                                                         #
 ############################################################################################################################################################
 
-COMPILE | DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v16_thompson                            |                | fv3         |
+COMPILE | APP=ATM DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v16_thompson                    |                | fv3         |
 
 RUN     | fv3_ccpp_gsd_debug                                                                                                |                | fv3         |
 RUN     | fv3_ccpp_gsd_diag3d_debug                                                                                         |                | fv3         |
@@ -54,6 +54,6 @@ RUN     | fv3_ccpp_gsd_mynnsfc_debug
 RUN     | fv3_ccpp_gsd_noah_mynnsfc_debug                                                                                   |                | fv3         |
 RUN     | fv3_ccpp_thompson_no_aero_debug                                                                                   |                | fv3         |
 
-COMPILE | 32BIT=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAP,FV3_HRRR                                                               |                | fv3         |
+COMPILE | APP=ATM 32BIT=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAP,FV3_HRRR                                                       |                | fv3         |
 # Run tests
 RUN     | fv3_ccpp_gsd_sar_debug                                                                                            |                | fv3         |
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index 23ea04488f..d1bac460d1 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -2,10 +2,10 @@
 # CCPP PROD tests                                                                                                                                                #
 ##################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_gfdlmp                                                                                              |                | fv3         |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_gfdlmp                                                                                      |                | fv3         |
 RUN     | fv3_gfdlmp                                                                                                              |                | fv3         |
 
-COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                              |                | fv3         |
+COMPILE | APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP                      |                | fv3         |
 RUN     | fv3_gfs_v15p2                                                                                                           |                | fv3         |
 RUN     | fv3_gfs_v16                                                                                                             |                | fv3         |
 RUN     | fv3_gfs_v16_restart                                                                                                     |                |             | fv3_gfs_v16
@@ -14,13 +14,13 @@ RUN     | fv3_gfs_v16_flake
 RUN     | fv3_gfs_v15p2_RRTMGP                                                                                                    |                | fv3         |
 RUN     | fv3_gfs_v16_RRTMGP                                                                                                      |                | fv3         |
 
-COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y                                                          |                | fv3         |
+COMPILE | APP=ATM SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y                                                  |                | fv3         |
 RUN     | fv3_gsd                                                                                                                 |                | fv3         |
 RUN     | fv3_thompson                                                                                                            |                | fv3         |
 RUN     | fv3_thompson_no_aero                                                                                                    |                | fv3         |
 RUN     | fv3_rrfs_v1beta                                                                                                         |                | fv3         |
 
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                           |                | fv3         |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras                                   |                | fv3         |
 RUN     | fv3_HAFS_v0_hwrf_thompson                                                                                               |                | fv3         |
 #RUN     | fv3_HAFS_v0_hwrf                                                                                                        |                | fv3         |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson                                                                                           |                | fv3         |
@@ -33,7 +33,7 @@ RUN     | fv3_gfs_v16_ras
 ##################################################################################################################################################################
 
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
-COMPILE | 32BIT=Y DEBUG=Y                                                                                                         |                | fv3         |
+COMPILE | APP=ATM 32BIT=Y DEBUG=Y                                                                                                 |                | fv3         |
 RUN     | fv3_control_debug                                                                                                       |                | fv3         |
 RUN     | fv3_regional_control_debug                                                                                              |                | fv3         |
 RUN     | fv3_rrfs_v1beta_debug                                                                                                   |                | fv3         |
@@ -41,16 +41,16 @@ RUN     | fv3_gsd_debug
 RUN     | fv3_thompson_debug                                                                                                      |                | fv3         |
 RUN     | fv3_thompson_no_aero_debug                                                                                              |                | fv3         |
 
-COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP DEBUG=Y                                        |                | fv3         |
+COMPILE | APP=ATM SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP DEBUG=Y                                |                | fv3         |
 RUN     | fv3_gfs_v15p2_debug                                                                                                     |                | fv3         |
 RUN     | fv3_gfs_v16_debug                                                                                                       |                | fv3         |
 RUN     | fv3_gfs_v15p2_RRTMGP_debug                                                                                              |                | fv3         |
 RUN     | fv3_gfs_v16_RRTMGP_debug                                                                                                |                | fv3         |
 
-COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                        |                | fv3         |
+COMPILE | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y                                                                |                | fv3         |
 RUN     | fv3_multigases                                                                                                          |                | fv3         |
 
-COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                                   |                | fv3         |
+COMPILE | APP=ATM SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v16_ras DEBUG=Y                           |                | fv3         |
 RUN     | fv3_HAFS_v0_hwrf_thompson_debug                                                                                         |                | fv3         |
 #RUN     | fv3_HAFS_v0_hwrf_debug                                                                                                  |                | fv3         |
 RUN     | fv3_esg_HAFS_v0_hwrf_thompson_debug                                                                                     |                | fv3         |
@@ -61,10 +61,10 @@ RUN     | fv3_gfs_v16_ras_debug
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y                                   |                | fv3         |
+COMPILE | APP=S2S SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled                                 |                | fv3         |
 
 ##################################################################################################################################################################
 # Data Atmosphere tests                                                                                                                                          #
 ##################################################################################################################################################################
 
-COMPILE | DATM=Y S2S=Y                                                                                                            |                | fv3         |
+COMPILE | APP=DATM_NEMS                                                                                                           |                | fv3         |
diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
index a6e982a4de..34ed5dff25 100755
--- a/tests/rt_utils.sh
+++ b/tests/rt_utils.sh
@@ -375,8 +375,6 @@ rocoto_create_compile_task() {
     echo "  </metatask>" >> $ROCOTO_XML
   fi
 
-  rocoto_cmd="&PATHRT;/compile.sh $MACHINE_ID \"${MAKE_OPT}\" $COMPILE_NR"
-
   # serialize WW3 builds. FIXME
   DEP_STRING=""
   if [[ ${MAKE_OPT^^} =~ "WW3=Y" && ${COMPILE_PREV_WW3_NR} != '' ]]; then
@@ -393,7 +391,6 @@ rocoto_create_compile_task() {
   fi
   if [[ ${MACHINE_ID} == wcoss_cray ]]; then
     BUILD_CORES=24
-    rocoto_cmd="aprun -n 1 -j 1 -N 1 -d $BUILD_CORES $rocoto_cmd"
     NATIVE="<exclusive></exclusive> <envar><name>PATHTR</name><value>&PATHTR;</value></envar>"
   fi
   if [[ ${MACHINE_ID} == jet ]]; then
@@ -406,14 +403,15 @@ rocoto_create_compile_task() {
   cat << EOF >> $ROCOTO_XML
   <task name="compile_${COMPILE_NR}" maxtries="3">
     $DEP_STRING
-    <command>$rocoto_cmd</command>
+    <command>&PATHRT;/run_compile.sh &PATHRT; &RUNDIR_ROOT; "${MAKE_OPT}" ${COMPILE_NR}</command>
     <jobname>compile_${COMPILE_NR}</jobname>
     <account>${ACCNR}</account>
     <queue>${COMPILE_QUEUE}</queue>
     <partition>${PARTITION}</partition>
     <cores>${BUILD_CORES}</cores>
     <walltime>${BUILD_WALLTIME}</walltime>
-    <join>&LOG;/compile_${COMPILE_NR}.log</join>
+    <stdout>&RUNDIR_ROOT;/compile_${COMPILE_NR}/out</stdout>
+    <stderr>&RUNDIR_ROOT;/compile_${COMPILE_NR}/err</stderr>
     ${NATIVE}
   </task>
 EOF
@@ -450,7 +448,8 @@ rocoto_create_run_task() {
       <partition>${PARTITION}</partition>
       <nodes>${NODES}:ppn=${TPN}</nodes>
       <walltime>00:${WLCLK}:00</walltime>
-      <join>&LOG;/run_${TEST_NR}_${TEST_NAME}${RT_SUFFIX}.log</join>
+      <stdout>&RUNDIR_ROOT;/${TEST_NAME}${RT_SUFFIX}/out</stdout>
+      <stderr>&RUNDIR_ROOT;/${TEST_NAME}${RT_SUFFIX}/err</stderr>
       ${NATIVE}
     </task>
 EOF
diff --git a/tests/run_compile.sh b/tests/run_compile.sh
index 7ee1db6ea5..5de9cb5663 100755
--- a/tests/run_compile.sh
+++ b/tests/run_compile.sh
@@ -35,6 +35,8 @@ export TEST_NR=${COMPILE_NR}
 export JBNME="compile_${COMPILE_NR}"
 export RUNDIR=${RUNDIR_ROOT}/${TEST_NAME}_${TEST_NR}
 
+echo -n "${JBNME}, $( date +%s )," > ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+
 source rt_utils.sh
 source atparse.bash
 
@@ -64,5 +66,7 @@ fi
 # End compile job
 ################################################################################
 
+echo " $( date +%s )" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+
 elapsed=$SECONDS
 echo "Elapsed time $elapsed seconds. Compile ${COMPILE_NR}"
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 582e3bd179..5e9cb3ac52 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -50,6 +50,8 @@ export CNTL_DIR=${CNTL_DIR}${BL_SUFFIX}
 
 export JBNME=$(basename $RUNDIR_ROOT)_${TEST_NR}
 
+echo -n "${TEST_NAME}, $( date +%s )," > ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+
 UNIT_TEST=${UNIT_TEST:-false}
 if [[ ${UNIT_TEST} == false ]]; then
   REGRESSIONTEST_LOG=${LOG_DIR}/rt_${TEST_NR}_${TEST_NAME}${RT_SUFFIX}.log
@@ -167,5 +169,7 @@ check_results
 # End test
 ################################################################################
 
+echo " $( date +%s )" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+
 elapsed=$SECONDS
 echo "Elapsed time $elapsed seconds. Test ${TEST_NAME}"
diff --git a/tests/utest b/tests/utest
index 4ba5c5bbfa..28a2a9b8d5 100755
--- a/tests/utest
+++ b/tests/utest
@@ -55,7 +55,7 @@ cleanup() {
 build_utests() {
   [[ -f $build_file ]] || error "$build_file does not exist"
 
-  rm -f fv3_*.exe modules.fv3_* $compile_log
+  rm -f fv3_*.exe modules.fv3_*
 
   model_found=false
   base_opt=
@@ -92,9 +92,12 @@ build_utests() {
         ;;
     esac
     MAKE_OPT=$(echo $MAKE_OPT | sed -e 's/^ *//' -e 's/ *$//')
+    export COMPILE_NR=${name}
 
       cat <<-EOF > ${RUNDIR_ROOT}/compile_${name}.env
 				export MACHINE_ID=${MACHINE_ID}
+				export JOB_NR=${COMPILE_NR}
+				export COMPILE_NR=${COMPILE_NR}
 				export PATHRT=${PATHRT}
 				export PATHTR=${PATHTR}
 				export SCHEDULER=${SCHEDULER}
@@ -119,6 +122,7 @@ build_utests() {
 }
 
 run_utests() {
+  JOB_NR=0
   for rc in $run_case; do
     # load default variables and override as necessary
     source default_vars.sh
@@ -132,6 +136,7 @@ run_utests() {
     comp_nm=std
 
     RT_SUFFIX="_${rc}"
+    JOB_NR=$( printf '%03d' $(( 10#$JOB_NR + 1 )) )
 
     case $rc in
       std_base)
@@ -332,6 +337,7 @@ run_utests() {
     esac
 
     cat <<- EOF > ${RUNDIR_ROOT}/run_test${RT_SUFFIX}.env
+			export JOB_NR=${JOB_NR}
 			export MACHINE_ID=${MACHINE_ID}
 			export RTPWD=${RTPWD}
 			export INPUTDATA_ROOT=${INPUTDATA_ROOT}
@@ -631,7 +637,7 @@ if [[ $run_case =~ std_base && ! $run_case =~ ^std_base ]]; then
 fi
 
 # log directory
-LOG_DIR=${PATHRT}/log_ut_$MACHINE_ID
+export LOG_DIR=${PATHRT}/log_ut_$MACHINE_ID
 rm -rf ${LOG_DIR}
 mkdir ${LOG_DIR}
 
@@ -667,7 +673,6 @@ if [[ $ECFLOW == true ]]; then
   fi
 fi
 
-compile_log=${PATHRT}/Compile_ut_$MACHINE_ID.log
 unittest_log=${PATHRT}/UnitTests_$MACHINE_ID.log
 REGRESSIONTEST_LOG=$unittest_log
 
@@ -699,9 +704,6 @@ if [[ $skip_compile == true ]]; then
 else
   echo "cases to compile: $compile_case"
   build_utests
-  if [[ $ECFLOW == false ]]; then
-    cat ${LOG_DIR}/compile_*.log > ${compile_log}
-  fi
 fi
 
 # if skipping run, stop after build. print out status information and
@@ -749,9 +751,6 @@ fi
 ####                       UNIT TEST STATUS                         ####
 ########################################################################
 set +e
-if [[ $ECFLOW == true ]]; then
-  cat ${LOG_DIR}/compile_*.log > ${compile_log}
-fi
 cat ${LOG_DIR}/ut_*.log | tee -a ${unittest_log}
 
 if [[ -e fail_unit_test ]]; then
diff --git a/tests/utest.bld b/tests/utest.bld
index a2852dbeb9..be685aa6d1 100644
--- a/tests/utest.bld
+++ b/tests/utest.bld
@@ -1,22 +1,22 @@
-fv3_control              | SUITES=FV3_GFS_2017
-fv3_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
-fv3_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
-fv3_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
-fv3_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
-fv3_stochy               | SUITES=FV3_GFS_2017
-fv3_iau                  | SUITES=FV3_GFS_2017
-fv3_ca                   | SUITES=FV3_GFS_2017
-fv3_lheatstrg            | SUITES=FV3_GFS_2017
-fv3_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_gfdlmprad_atmwav     | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
-fv3_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
-fv3_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
-fv3_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
-fv3_csawmg               | SUITES=FV3_GFS_2017_csawmg
-fv3_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
-fv3_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
-fv3_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
-fv3_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
-fv3_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
-fv3_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_control              | APP=ATM SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf_esmf | APP=ATM SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf      | APP=ATM SUITES=FV3_GFS_2017
+fv3_wrtGlatlon_netcdf    | APP=ATM SUITES=FV3_GFS_2017
+fv3_wrtGauss_nemsio      | APP=ATM SUITES=FV3_GFS_2017
+fv3_stochy               | APP=ATM SUITES=FV3_GFS_2017
+fv3_iau                  | APP=ATM SUITES=FV3_GFS_2017
+fv3_ca                   | APP=ATM SUITES=FV3_GFS_2017
+fv3_lheatstrg            | APP=ATM SUITES=FV3_GFS_2017
+fv3_gfdlmprad            | APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
+fv3_gfdlmprad_atmwav     | APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
+fv3_multigases           | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+fv3_gfdlmp               | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_gwd        | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_noahmp     | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_csawmg               | APP=ATM SUITES=FV3_GFS_2017_csawmg
+fv3_satmedmf             | APP=ATM SUITES=FV3_GFS_2017_satmedmf
+fv3_satmedmfq            | APP=ATM SUITES=FV3_GFS_2017_satmedmfq
+fv3_gfsv16_csawmg        | APP=ATM SUITES=FV3_GFS_v16_csawmg
+fv3_gfsv16_csawmgt       | APP=ATM SUITES=FV3_GFS_v16_csawmg
+fv3_gocart_clm           | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_gfs_v16_flake        | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake

From c3dee4d3c67a9f1bd5a879ad9d4296afae669ab2 Mon Sep 17 00:00:00 2001
From: Jili Dong <Jili.Dong@noaa.gov>
Date: Tue, 20 Apr 2021 13:51:10 +0000
Subject: [PATCH 04/10] add submodule of fv3atm

---
 .gitmodules | 4 ++--
 FV3         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0c3b70cc3f..e0f6c2562f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/JiliDong-NOAA/fv3atm 
+  branch = emc-2021-cloud 
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
diff --git a/FV3 b/FV3
index 07b00a9a84..2c24789425 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 07b00a9a84782aa95a18cc8a9c91ba31a76ea619
+Subproject commit 2c247894250f66894af69d0abf8ae31101e2cf7b

From 3335d575ad2c5c3ef830cbe944cbb0096f647327 Mon Sep 17 00:00:00 2001
From: Jili Dong <Jili.Dong@noaa.gov>
Date: Tue, 20 Apr 2021 19:05:05 +0000
Subject: [PATCH 05/10] update FV3: remove CAPS version mp_nssl_2mom

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index 2c24789425..c3355a5c91 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 2c247894250f66894af69d0abf8ae31101e2cf7b
+Subproject commit c3355a5c915fd5681a2a3b0377bc991d643fb062

From 5595de4114813949f11bbf2b5513ce87d643c5f9 Mon Sep 17 00:00:00 2001
From: Jili Dong <Jili.Dong@noaa.gov>
Date: Fri, 30 Apr 2021 14:25:49 +0000
Subject: [PATCH 06/10] FV3 update: fix nssl mp reproducibility issue

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index c3355a5c91..50d405734c 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit c3355a5c915fd5681a2a3b0377bc991d643fb062
+Subproject commit 50d405734cf2d67385669d109116af7cb80a083b

From b1040c452a5cfbd341b2a622c378665236ecfc85 Mon Sep 17 00:00:00 2001
From: "Christina.Holt" <Christina.Holt@noaa.gov>
Date: Thu, 10 Jun 2021 19:07:27 +0000
Subject: [PATCH 07/10] Point to Christina's branch for testing.

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index f2d0ad52bc..6613be2cf0 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit f2d0ad52bc3ce6d64388eae3c839487dde2a0c2a
+Subproject commit 6613be2cf0d66b313f23c5149ce25064ff421573

From b46622ee9256ab16ccc679fc3200873a0e835168 Mon Sep 17 00:00:00 2001
From: "Christina.Holt" <Christina.Holt@noaa.gov>
Date: Thu, 10 Jun 2021 19:09:01 +0000
Subject: [PATCH 08/10] Pointing to CH module.

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ad20672ba3..54a7108567 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-GSL/fv3atm
-  branch = RRFS_cloud
+  url = https://github.com/christinaholtNOAA/fv3atm
+  branch = test_RRFS_cloud
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

From 41939b88f62e98722a4263aafcf389c05f3f7b28 Mon Sep 17 00:00:00 2001
From: "Christina.Holt" <Christina.Holt@noaa.gov>
Date: Thu, 10 Jun 2021 19:10:35 +0000
Subject: [PATCH 09/10] Updating pointer for FV3

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index 6613be2cf0..97decccef2 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 6613be2cf0d66b313f23c5149ce25064ff421573
+Subproject commit 97decccef235cb5406af4bfbcd3581e8c6422b2e

From 61bd717eed97a7110124ac6dd09fae1b11340e28 Mon Sep 17 00:00:00 2001
From: "Christina.Holt" <Christina.Holt@noaa.gov>
Date: Tue, 15 Jun 2021 01:40:36 +0000
Subject: [PATCH 10/10] Updating modules and pointer to FV3

---
 .gitmodules | 4 ++--
 FV3         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 54a7108567..ad20672ba3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/christinaholtNOAA/fv3atm
-  branch = test_RRFS_cloud
+  url = https://github.com/NOAA-GSL/fv3atm
+  branch = RRFS_cloud
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS
diff --git a/FV3 b/FV3
index 97decccef2..015c94afc4 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 97decccef235cb5406af4bfbcd3581e8c6422b2e
+Subproject commit 015c94afc4493e948d59f3dcf3688574ec250d26