diff --git a/.gitmodules b/.gitmodules
index d5072b9e65..5ece87098e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,5 +40,5 @@
   branch = develop
 [submodule "AQM"]
   path = AQM
-  url = https://github.com/NOAA-EMC/AQM 
+  url = https://github.com/NOAA-EMC/AQM
   branch = develop
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfdfab30e..5050a009e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,9 +164,15 @@ endif()
 ### Wave components [WW3]
 ###############################################################################
 if(WW3)
-  # Set options for WW3 build
-  set(SWITCH "multi_esmf" CACHE STRING "Default to switch_multi_esmf")
-  set(MULTI_ESMF ON CACHE BOOL "Enable ESMF for WW3")
+  if(APP MATCHES "^(ATMW)$")
+    set(SWITCH "multi_esmf" CACHE STRING "ESMF cap")
+    set(UFS_CAP "MULTI_ESMF" CACHE STRING "Build with MULTI_ESMF cap")
+    list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
+  else()
+    set(SWITCH "meshcap" CACHE STRING "NUOPC mesh cap")
+    set(UFS_CAP "NUOPC_MESH" CACHE STRING "Build with NUOPC_MESH cap")
+    list(APPEND _ufs_defs_private FRONT_WW3=wav_comp_nuopc)
+  endif()
   add_subdirectory(WW3)
 endif()
 
@@ -225,7 +231,6 @@ if(UFS_GOCART)
 endif()
 
 if(WW3)
-  list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
   target_link_libraries(ufs PUBLIC WW3::WW3)
 endif()
 
diff --git a/WW3 b/WW3
index b8ea5cdaf1..ec5077a57e 160000
--- a/WW3
+++ b/WW3
@@ -1 +1 @@
-Subproject commit b8ea5cdaf1bf54c44e9fed4a90bc71a5334cd384
+Subproject commit ec5077a57edf8a6edf50c8c2b705195e7180ddf3
diff --git a/tests/OpnReqTests_cpld_bmark_p8_hera.intel.log b/tests/OpnReqTests_cpld_bmark_p8_hera.intel.log
index 479b6adffa..6c9324ea5d 100644
--- a/tests/OpnReqTests_cpld_bmark_p8_hera.intel.log
+++ b/tests/OpnReqTests_cpld_bmark_p8_hera.intel.log
@@ -1,15 +1,14 @@
-Fri Jan  7 16:13:28 UTC 2022
+Thu May 26 16:42:22 UTC 2022
 Start Operation Requirement Test
 
-Compile std elapsed time 431 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile std elapsed time 549 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_dcp
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_dcp
 Checking test dcp cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing 20130401.060000.out_grd.gwes_30m .........OK
- Comparing 20130401.060000.out_pnt.points .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -48,21 +47,75 @@ Checking test dcp cpld_bmark_p8 results ....
  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
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1061.233846
-  0: The maximum resident set size (KB)                   = 1396392
+  0: The total amount of wall time                        = 1212.457555
+  0: The maximum resident set size (KB)                   = 5658120
 
 Test dcp cpld_bmark_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_std_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_rst
+Checking test rst cpld_bmark_p8 results ....
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing atmf006.nc .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........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/iced.2013-04-01-21600.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/MOM.res.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/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing sfcf006.nc .........OK
+
+  0: The total amount of wall time                        = 757.420850
+  0: The maximum resident set size (KB)                   = 5615572
+
+Test rst cpld_bmark_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_std_base
 Checking test std_base cpld_bmark_p8 results ....
 Moving baseline std_base cpld_bmark_p8 files ....
  Moving sfcf006.nc .........OK
  Moving atmf006.nc .........OK
- Moving 20130401.060000.out_grd.gwes_30m .........OK
- Moving 20130401.060000.out_pnt.points .........OK
+ Moving gocart.inst_aod.20130401_0600z.nc4 .........OK
  Moving RESTART/coupler.res .........OK
  Moving RESTART/fv_core.res.nc .........OK
  Moving RESTART/fv_core.res.tile1.nc .........OK
@@ -101,20 +154,21 @@ Moving baseline std_base cpld_bmark_p8 files ....
  Moving RESTART/MOM.res_3.nc .........OK
  Moving RESTART/iced.2013-04-01-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Moving 20130401.060000.out_pnt.ww3 .........OK
+ Moving 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1081.300718
-  0: The maximum resident set size (KB)                   = 1401732
+  0: The total amount of wall time                        = 1206.188040
+  0: The maximum resident set size (KB)                   = 5654532
 
 Test std_base cpld_bmark_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_21817/cpld_bmark_p8_thr
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_bmark_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_11070/cpld_bmark_p8_thr
 Checking test thr cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing 20130401.060000.out_grd.gwes_30m .........OK
- Comparing 20130401.060000.out_pnt.points .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -153,12 +207,14 @@ Checking test thr cpld_bmark_p8 results ....
  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
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 865.097270
-  0: The maximum resident set size (KB)                   = 1378960
+  0: The total amount of wall time                        = 1140.976795
+  0: The maximum resident set size (KB)                   = 5940432
 
 Test thr cpld_bmark_p8 PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan  7 17:32:38 UTC 2022
-Elapsed time: 01h:19m:11s. Have a nice day!
+Thu May 26 18:03:46 UTC 2022
+Elapsed time: 01h:21m:25s. Have a nice day!
diff --git a/tests/OpnReqTests_cpld_control_p8_hera.intel.log b/tests/OpnReqTests_cpld_control_p8_hera.intel.log
index 4e150f4f20..bbbe7db62d 100644
--- a/tests/OpnReqTests_cpld_control_p8_hera.intel.log
+++ b/tests/OpnReqTests_cpld_control_p8_hera.intel.log
@@ -1,10 +1,72 @@
-Fri Jan 21 21:39:09 UTC 2022
+Thu May 26 13:51:42 UTC 2022
 Start Operation Requirement Test
 
-Compile std elapsed time 426 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile dbg elapsed time 310 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile std elapsed time 586 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_dbg_base
+Checking test dbg_base cpld_control_p8 results ....
+Moving baseline dbg_base cpld_control_p8 files ....
+ Moving sfcf003.tile1.nc .........OK
+ Moving sfcf003.tile2.nc .........OK
+ Moving sfcf003.tile3.nc .........OK
+ Moving sfcf003.tile4.nc .........OK
+ Moving sfcf003.tile5.nc .........OK
+ Moving sfcf003.tile6.nc .........OK
+ Moving atmf003.tile1.nc .........OK
+ Moving atmf003.tile2.nc .........OK
+ Moving atmf003.tile3.nc .........OK
+ Moving atmf003.tile4.nc .........OK
+ Moving atmf003.tile5.nc .........OK
+ Moving atmf003.tile6.nc .........OK
+ Moving gocart.inst_aod.20210322_0900z.nc4 .........OK
+ Moving RESTART/coupler.res .........OK
+ Moving RESTART/fv_core.res.nc .........OK
+ Moving RESTART/fv_core.res.tile1.nc .........OK
+ Moving RESTART/fv_core.res.tile2.nc .........OK
+ Moving RESTART/fv_core.res.tile3.nc .........OK
+ Moving RESTART/fv_core.res.tile4.nc .........OK
+ Moving RESTART/fv_core.res.tile5.nc .........OK
+ Moving RESTART/fv_core.res.tile6.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Moving RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Moving RESTART/fv_tracer.res.tile1.nc .........OK
+ Moving RESTART/fv_tracer.res.tile2.nc .........OK
+ Moving RESTART/fv_tracer.res.tile3.nc .........OK
+ Moving RESTART/fv_tracer.res.tile4.nc .........OK
+ Moving RESTART/fv_tracer.res.tile5.nc .........OK
+ Moving RESTART/fv_tracer.res.tile6.nc .........OK
+ Moving RESTART/phy_data.tile1.nc .........OK
+ Moving RESTART/phy_data.tile2.nc .........OK
+ Moving RESTART/phy_data.tile3.nc .........OK
+ Moving RESTART/phy_data.tile4.nc .........OK
+ Moving RESTART/phy_data.tile5.nc .........OK
+ Moving RESTART/phy_data.tile6.nc .........OK
+ Moving RESTART/sfc_data.tile1.nc .........OK
+ Moving RESTART/sfc_data.tile2.nc .........OK
+ Moving RESTART/sfc_data.tile3.nc .........OK
+ Moving RESTART/sfc_data.tile4.nc .........OK
+ Moving RESTART/sfc_data.tile5.nc .........OK
+ Moving RESTART/sfc_data.tile6.nc .........OK
+ Moving RESTART/MOM.res.nc .........OK
+ Moving RESTART/iced.2021-03-22-32400.nc .........OK
+ Moving RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Moving 20210322.090000.out_pnt.ww3 .........OK
+ Moving 20210322.090000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 768.784865
+  0: The maximum resident set size (KB)                   = 5061608
+
+Test dbg_base cpld_control_p8 PASS
+
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_32523/cpld_control_p8_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_dcp
 Checking test dcp cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -30,6 +92,7 @@ Checking test dcp cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -65,18 +128,17 @@ Checking test dcp cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 222.661495
-  0: The maximum resident set size (KB)                   = 620508
+  0: The total amount of wall time                        = 414.182452
+  0: The maximum resident set size (KB)                   = 5012048
 
 Test dcp cpld_control_p8 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_32523/cpld_control_p8_fhz
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_fhz
 Checking test fhz cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc ............ALT CHECK......OK
  Comparing sfcf021.tile2.nc ............ALT CHECK......OK
@@ -90,6 +152,7 @@ Checking test fhz cpld_control_p8 results ....
  Comparing atmf021.tile4.nc .........OK
  Comparing atmf021.tile5.nc .........OK
  Comparing atmf021.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -125,18 +188,77 @@ Checking test fhz cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 209.405067
-  0: The maximum resident set size (KB)                   = 631364
+  0: The total amount of wall time                        = 402.060323
+  0: The maximum resident set size (KB)                   = 4999632
 
 Test fhz cpld_control_p8 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_32523/cpld_control_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_rst
+Checking test rst cpld_control_p8 results ....
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing atmf024.tile1.nc .........OK
+ Comparing atmf024.tile2.nc .........OK
+ Comparing atmf024.tile3.nc .........OK
+ Comparing atmf024.tile4.nc .........OK
+ Comparing atmf024.tile5.nc .........OK
+ Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........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/iced.2021-03-23-21600.nc .........OK
+ Comparing RESTART/MOM.res.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/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing sfcf024.tile1.nc .........OK
+ Comparing sfcf024.tile2.nc .........OK
+ Comparing sfcf024.tile3.nc .........OK
+ Comparing sfcf024.tile4.nc .........OK
+ Comparing sfcf024.tile5.nc .........OK
+ Comparing sfcf024.tile6.nc .........OK
+
+  0: The total amount of wall time                        = 244.592027
+  0: The maximum resident set size (KB)                   = 4968604
+
+Test rst cpld_control_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_std_base
 Checking test std_base cpld_control_p8 results ....
 Moving baseline std_base cpld_control_p8 files ....
  Moving sfcf021.tile1.nc .........OK
@@ -163,6 +285,7 @@ Moving baseline std_base cpld_control_p8 files ....
  Moving atmf024.tile4.nc .........OK
  Moving atmf024.tile5.nc .........OK
  Moving atmf024.tile6.nc .........OK
+ Moving gocart.inst_aod.20210323_0600z.nc4 .........OK
  Moving RESTART/coupler.res .........OK
  Moving RESTART/fv_core.res.nc .........OK
  Moving RESTART/fv_core.res.tile1.nc .........OK
@@ -198,18 +321,17 @@ Moving baseline std_base cpld_control_p8 files ....
  Moving RESTART/MOM.res.nc .........OK
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Moving 20210323.060000.out_grd.glo_1deg .........OK
- Moving 20210323.060000.out_pnt.points .........OK
- Moving 20210323.060000.restart.glo_1deg .........OK
+ Moving 20210323.060000.out_pnt.ww3 .........OK
+ Moving 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 207.966592
-  0: The maximum resident set size (KB)                   = 628896
+  0: The total amount of wall time                        = 401.559789
+  0: The maximum resident set size (KB)                   = 5011096
 
 Test std_base cpld_control_p8 PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_32523/cpld_control_p8_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_6018/cpld_control_p8_thr
 Checking test thr cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -235,6 +357,7 @@ Checking test thr cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -270,15 +393,14 @@ Checking test thr cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 240.240599
-  0: The maximum resident set size (KB)                   = 690472
+  0: The total amount of wall time                        = 467.282328
+  0: The maximum resident set size (KB)                   = 5695632
 
 Test thr cpld_control_p8 PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan 21 22:35:02 UTC 2022
-Elapsed time: 00h:55m:54s. Have a nice day!
+Thu May 26 14:24:48 UTC 2022
+Elapsed time: 00h:33m:07s. Have a nice day!
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
index 85b9acfd89..8020eeb1d8 100644
--- a/tests/RegressionTests_cheyenne.gnu.log
+++ b/tests/RegressionTests_cheyenne.gnu.log
@@ -1,16 +1,16 @@
-Fri May 27 07:31:24 MDT 2022
+Sun May 29 18:11:08 MDT 2022
 Start Regression test
 
-Compile 001 elapsed time 400 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v17_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 002 elapsed time 408 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 003 elapsed time 809 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 004 elapsed time 199 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 005 elapsed time 520 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 006 elapsed time 290 seconds. -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 007 elapsed time 300 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 001 elapsed time 402 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v17_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 002 elapsed time 418 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 003 elapsed time 803 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 004 elapsed time 205 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 005 elapsed time 552 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 006 elapsed time 316 seconds. -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 007 elapsed time 305 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control
 Checking test 001 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -57,14 +57,14 @@ Checking test 001 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 274.925850
-0:The maximum resident set size (KB)                   = 433376
+0:The total amount of wall time                        = 268.681365
+0:The maximum resident set size (KB)                   = 433132
 
 Test 001 control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_restart
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_restart
 Checking test 002 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -103,14 +103,14 @@ Checking test 002 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 137.387932
-0:The maximum resident set size (KB)                   = 182984
+0:The total amount of wall time                        = 137.307133
+0:The maximum resident set size (KB)                   = 182928
 
 Test 002 control_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_c48
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_c48
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_c48
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_c48
 Checking test 003 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -149,14 +149,14 @@ Checking test 003 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 816.918591
-0:The maximum resident set size (KB)                   = 674244
+0:The total amount of wall time                        = 816.887016
+0:The maximum resident set size (KB)                   = 674112
 
 Test 003 control_c48 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_stochy
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_stochy
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_stochy
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_stochy
 Checking test 004 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -167,14 +167,14 @@ Checking test 004 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-0:The total amount of wall time                        = 176.695456
-0:The maximum resident set size (KB)                   = 427424
+0:The total amount of wall time                        = 176.340715
+0:The maximum resident set size (KB)                   = 427476
 
 Test 004 control_stochy PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_flake
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_flake
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_flake
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_flake
 Checking test 005 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -185,14 +185,14 @@ Checking test 005 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 338.574106
-0:The maximum resident set size (KB)                   = 485540
+0:The total amount of wall time                        = 337.355609
+0:The maximum resident set size (KB)                   = 485572
 
 Test 005 control_flake PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson
 Checking test 006 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -203,14 +203,14 @@ Checking test 006 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 378.463560
-0:The maximum resident set size (KB)                   = 795656
+0:The total amount of wall time                        = 374.718905
+0:The maximum resident set size (KB)                   = 795660
 
 Test 006 control_thompson PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_no_aero
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson_no_aero
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_no_aero
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson_no_aero
 Checking test 007 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -221,14 +221,14 @@ Checking test 007 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 348.527354
-0:The maximum resident set size (KB)                   = 789512
+0:The total amount of wall time                        = 354.887336
+0:The maximum resident set size (KB)                   = 789440
 
 Test 007 control_thompson_no_aero PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_ras
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_ras
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_ras
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_ras
 Checking test 008 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -239,14 +239,14 @@ Checking test 008 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 291.208628
-0:The maximum resident set size (KB)                   = 445940
+0:The total amount of wall time                        = 291.539843
+0:The maximum resident set size (KB)                   = 445876
 
 Test 008 control_ras PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_p8
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_p8
 Checking test 009 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -293,14 +293,14 @@ Checking test 009 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 320.837834
-0:The maximum resident set size (KB)                   = 818228
+0:The total amount of wall time                        = 324.857128
+0:The maximum resident set size (KB)                   = 818256
 
 Test 009 control_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_control
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_control
 Checking test 010 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -347,14 +347,14 @@ Checking test 010 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 703.830982
-0:The maximum resident set size (KB)                   = 774764
+0:The total amount of wall time                        = 700.059312
+0:The maximum resident set size (KB)                   = 774776
 
 Test 010 rap_control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_2threads
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_2threads
 Checking test 011 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -401,14 +401,14 @@ Checking test 011 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 1237.303147
-0:The maximum resident set size (KB)                   = 842964
+0:The total amount of wall time                        = 1235.591809
+0:The maximum resident set size (KB)                   = 842996
 
 Test 011 rap_2threads PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_restart
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_restart
 Checking test 012 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -447,14 +447,14 @@ Checking test 012 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 348.933353
-0:The maximum resident set size (KB)                   = 522892
+0:The total amount of wall time                        = 349.258766
+0:The maximum resident set size (KB)                   = 522880
 
 Test 012 rap_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_sfcdiff
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_sfcdiff
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_sfcdiff
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_sfcdiff
 Checking test 013 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -501,14 +501,14 @@ Checking test 013 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 707.562686
-0:The maximum resident set size (KB)                   = 774620
+0:The total amount of wall time                        = 705.205316
+0:The maximum resident set size (KB)                   = 774616
 
 Test 013 rap_sfcdiff PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_sfcdiff
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_sfcdiff_restart
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_sfcdiff
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_sfcdiff_restart
 Checking test 014 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -547,14 +547,14 @@ Checking test 014 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 351.202626
-0:The maximum resident set size (KB)                   = 522568
+0:The total amount of wall time                        = 350.793882
+0:The maximum resident set size (KB)                   = 522584
 
 Test 014 rap_sfcdiff_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/hrrr_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/hrrr_control
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/hrrr_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/hrrr_control
 Checking test 015 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -601,14 +601,14 @@ Checking test 015 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 682.943616
-0:The maximum resident set size (KB)                   = 772276
+0:The total amount of wall time                        = 680.806657
+0:The maximum resident set size (KB)                   = 772176
 
 Test 015 hrrr_control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_v1beta
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rrfs_v1beta
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_v1beta
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rrfs_v1beta
 Checking test 016 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -655,14 +655,14 @@ Checking test 016 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 697.989255
-0:The maximum resident set size (KB)                   = 771928
+0:The total amount of wall time                        = 697.228083
+0:The maximum resident set size (KB)                   = 771908
 
 Test 016 rrfs_v1beta PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_conus13km_hrrr_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rrfs_conus13km_hrrr_warm
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_conus13km_hrrr_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rrfs_conus13km_hrrr_warm
 Checking test 017 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -671,14 +671,14 @@ Checking test 017 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 319.946826
+0:The total amount of wall time                        = 318.907029
 0:The maximum resident set size (KB)                   = 593236
 
 Test 017 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_conus13km_radar_tten_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rrfs_conus13km_radar_tten_warm
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_conus13km_radar_tten_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rrfs_conus13km_radar_tten_warm
 Checking test 018 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -687,14 +687,14 @@ Checking test 018 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 320.218197
-0:The maximum resident set size (KB)                   = 595968
+0:The total amount of wall time                        = 320.447185
+0:The maximum resident set size (KB)                   = 596120
 
 Test 018 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rrfs_smoke_conus13km_hrrr_warm
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rrfs_smoke_conus13km_hrrr_warm
 Checking test 019 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -703,237 +703,237 @@ Checking test 019 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 345.911968
-0:The maximum resident set size (KB)                   = 607460
+0:The total amount of wall time                        = 345.919004
+0:The maximum resident set size (KB)                   = 607272
 
 Test 019 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_debug
 Checking test 020 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 80.778686
-0:The maximum resident set size (KB)                   = 424264
+0:The total amount of wall time                        = 80.857608
+0:The maximum resident set size (KB)                   = 424272
 
 Test 020 control_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_diag_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_diag_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_diag_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_diag_debug
 Checking test 021 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 87.211950
-0:The maximum resident set size (KB)                   = 482116
+0:The total amount of wall time                        = 87.065189
+0:The maximum resident set size (KB)                   = 482052
 
 Test 021 control_diag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/fv3_regional_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/regional_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/fv3_regional_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/regional_debug
 Checking test 022 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
-0:The total amount of wall time                        = 131.819522
-0:The maximum resident set size (KB)                   = 536180
+0:The total amount of wall time                        = 131.540807
+0:The maximum resident set size (KB)                   = 536176
 
 Test 022 regional_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_control_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_control_debug
 Checking test 023 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 147.679690
-0:The maximum resident set size (KB)                   = 797164
+0:The total amount of wall time                        = 146.757606
+0:The maximum resident set size (KB)                   = 797160
 
 Test 023 rap_control_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_diag_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_diag_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_diag_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_diag_debug
 Checking test 024 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 157.345137
-0:The maximum resident set size (KB)                   = 879736
+0:The total amount of wall time                        = 155.180110
+0:The maximum resident set size (KB)                   = 879696
 
 Test 024 rap_diag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_noah_sfcdiff_cires_ugwp_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_noah_sfcdiff_cires_ugwp_debug
 Checking test 025 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 236.169991
-0:The maximum resident set size (KB)                   = 795392
+0:The total amount of wall time                        = 235.424836
+0:The maximum resident set size (KB)                   = 795428
 
 Test 025 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rap_progcld_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rap_progcld_thompson_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rap_progcld_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rap_progcld_thompson_debug
 Checking test 026 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 147.850229
-0:The maximum resident set size (KB)                   = 797252
+0:The total amount of wall time                        = 147.312492
+0:The maximum resident set size (KB)                   = 797236
 
 Test 026 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_v1beta_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/rrfs_v1beta_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_v1beta_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/rrfs_v1beta_debug
 Checking test 027 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 146.772050
-0:The maximum resident set size (KB)                   = 791340
+0:The total amount of wall time                        = 147.118005
+0:The maximum resident set size (KB)                   = 791700
 
 Test 027 rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson_debug
 Checking test 028 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 95.984958
-0:The maximum resident set size (KB)                   = 782220
+0:The total amount of wall time                        = 97.652179
+0:The maximum resident set size (KB)                   = 782180
 
 Test 028 control_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_no_aero_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson_no_aero_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_no_aero_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson_no_aero_debug
 Checking test 029 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 92.977767
-0:The maximum resident set size (KB)                   = 777576
+0:The total amount of wall time                        = 92.064404
+0:The maximum resident set size (KB)                   = 777644
 
 Test 029 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_debug_extdiag
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson_extdiag_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_debug_extdiag
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson_extdiag_debug
 Checking test 030 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 104.086570
-0:The maximum resident set size (KB)                   = 823552
+0:The total amount of wall time                        = 104.187613
+0:The maximum resident set size (KB)                   = 823512
 
 Test 030 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_progcld_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_thompson_progcld_thompson_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_progcld_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_thompson_progcld_thompson_debug
 Checking test 031 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 96.528021
-0:The maximum resident set size (KB)                   = 782264
+0:The total amount of wall time                        = 96.474297
+0:The maximum resident set size (KB)                   = 782608
 
 Test 031 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_ras_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_ras_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_ras_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_ras_debug
 Checking test 032 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 83.564057
-0:The maximum resident set size (KB)                   = 434300
+0:The total amount of wall time                        = 83.939963
+0:The maximum resident set size (KB)                   = 434288
 
 Test 032 control_ras_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_stochy_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_stochy_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_stochy_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_stochy_debug
 Checking test 033 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 92.099622
-0:The maximum resident set size (KB)                   = 428532
+0:The total amount of wall time                        = 91.821641
+0:The maximum resident set size (KB)                   = 428464
 
 Test 033 control_stochy_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_debug_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_debug_p8
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_debug_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_debug_p8
 Checking test 034 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 93.395172
-0:The maximum resident set size (KB)                   = 809028
+0:The total amount of wall time                        = 93.167783
+0:The maximum resident set size (KB)                   = 809032
 
 Test 034 control_debug_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/control_wam_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/control_wam_debug
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/control_wam_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/control_wam_debug
 Checking test 035 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-0:The total amount of wall time                        = 143.189513
-0:The maximum resident set size (KB)                   = 171084
+0:The total amount of wall time                        = 143.233496
+0:The maximum resident set size (KB)                   = 170960
 
 Test 035 control_wam_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/cpld_control_c96_noaero_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/cpld_control_c96_noaero_p8
-Checking test 036 cpld_control_c96_noaero_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/cpld_control_noaero_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/cpld_control_noaero_p8
+Checking test 036 cpld_control_noaero_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
  Comparing sfcf021.tile3.nc .........OK
@@ -993,28 +993,30 @@ Checking test 036 cpld_control_c96_noaero_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 297.763703
-0:The maximum resident set size (KB)                   = 782692
+0:The total amount of wall time                        = 541.672925
+0:The maximum resident set size (KB)                   = 793740
 
-Test 036 cpld_control_c96_noaero_p8 PASS
+Test 036 cpld_control_noaero_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/cpld_debug_noaero_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/cpld_debug_noaero_p8
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/cpld_debug_noaero_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/cpld_debug_noaero_p8
 Checking test 037 cpld_debug_noaero_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.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
@@ -1048,28 +1050,30 @@ Checking test 037 cpld_debug_noaero_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 270.820007
-0:The maximum resident set size (KB)                   = 801528
+0:The total amount of wall time                        = 209.095901
+0:The maximum resident set size (KB)                   = 813052
 
 Test 037 cpld_debug_noaero_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/GNU/datm_cdeps_control_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_46242/datm_cdeps_control_cfsr
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/GNU/datm_cdeps_control_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_31733/datm_cdeps_control_cfsr
 Checking test 038 datm_cdeps_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                        = 173.985231
-0:The maximum resident set size (KB)                   = 644224
+0:The total amount of wall time                        = 172.864023
+0:The maximum resident set size (KB)                   = 646392
 
 Test 038 datm_cdeps_control_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 08:03:11 MDT 2022
-Elapsed time: 00h:31m:47s. Have a nice day!
+Sun May 29 18:43:31 MDT 2022
+Elapsed time: 00h:32m:23s. Have a nice day!
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
index b403fbb5fb..f517008968 100644
--- a/tests/RegressionTests_cheyenne.intel.log
+++ b/tests/RegressionTests_cheyenne.intel.log
@@ -1,25 +1,25 @@
-Fri May 27 07:16:25 MDT 2022
+Sun May 29 19:05:33 MDT 2022
 Start Regression test
 
-Compile 001 elapsed time 1234 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 002 elapsed time 405 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 706 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 765 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 752 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 006 elapsed time 589 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 007 elapsed time 367 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 310 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 001 elapsed time 1175 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 002 elapsed time 474 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 714 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 782 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 772 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 006 elapsed time 596 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 007 elapsed time 368 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 317 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
 Compile 009 elapsed time 332 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 286 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 909 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 012 elapsed time 883 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 013 elapsed time 424 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 014 elapsed time 202 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 779 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 016 elapsed time 628 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_control_p8
+Compile 010 elapsed time 284 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 901 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 012 elapsed time 874 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 013 elapsed time 441 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 014 elapsed time 198 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 015 elapsed time 778 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 016 elapsed time 630 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 318.731038
-0:The maximum resident set size (KB)                   = 4401432
+0:The total amount of wall time                        = 375.953452
+0:The maximum resident set size (KB)                   = 4407236
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,67 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.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.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
  Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-0:The total amount of wall time                        = 640.085079
-0:The maximum resident set size (KB)                   = 4802752
-
-Test 002 cpld_2threads_p8 PASS
-
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_decomp_p8
-Checking test 003 cpld_decomp_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,20 +141,18 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 314.727260
-0:The maximum resident set size (KB)                   = 4390076
+0:The total amount of wall time                        = 224.496676
+0:The maximum resident set size (KB)                   = 4365628
 
-Test 003 cpld_decomp_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_mpi_p8
-Checking test 004 cpld_mpi_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -228,6 +165,7 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -263,85 +201,18 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 278.450522
-0:The maximum resident set size (KB)                   = 4273536
+0:The total amount of wall time                        = 656.684442
+0:The maximum resident set size (KB)                   = 4811080
 
-Test 004 cpld_mpi_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_bmark_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_bmark_p8
-Checking test 005 cpld_bmark_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20130401_0600z.nc4 .........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
-
-0:The total amount of wall time                        = 1471.655474
-0:The maximum resident set size (KB)                   = 5359332
-
-Test 005 cpld_bmark_p8 PASS
-
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_control_c96_p8
-Checking test 006 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_decomp_p8
+Checking test 004 cpld_decomp_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -390,16 +261,18 @@ Checking test 006 cpld_control_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 310.122138
-0:The maximum resident set size (KB)                   = 4395460
+0:The total amount of wall time                        = 376.142295
+0:The maximum resident set size (KB)                   = 4394720
 
-Test 006 cpld_control_c96_p8 PASS
+Test 004 cpld_decomp_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_restart_c96_p8
-Checking test 007 cpld_restart_c96_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_mpi_p8
+Checking test 005 cpld_mpi_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -448,29 +321,31 @@ Checking test 007 cpld_restart_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-0:The total amount of wall time                        = 183.955108
-0:The maximum resident set size (KB)                   = 4355100
-
-Test 007 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_control_c192_p8
-Checking test 008 cpld_control_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+0:The total amount of wall time                        = 341.582102
+0:The maximum resident set size (KB)                   = 4278172
+
+Test 005 cpld_mpi_p8 PASS
+
+
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_control_c192_p8
+Checking test 006 cpld_control_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -504,31 +379,33 @@ Checking test 008 cpld_control_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-0:The total amount of wall time                        = 1448.079540
-0:The maximum resident set size (KB)                   = 4543596
-
-Test 008 cpld_control_c192_p8 PASS
-
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_restart_c192_p8
-Checking test 009 cpld_restart_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
+
+0:The total amount of wall time                        = 1454.171230
+0:The maximum resident set size (KB)                   = 4740520
+
+Test 006 cpld_control_c192_p8 PASS
+
+
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_restart_c192_p8
+Checking test 007 cpld_restart_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -562,21 +439,23 @@ Checking test 009 cpld_restart_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-0:The total amount of wall time                        = 1021.216039
-0:The maximum resident set size (KB)                   = 4508164
+0:The total amount of wall time                        = 813.729283
+0:The maximum resident set size (KB)                   = 4707060
 
-Test 009 cpld_restart_c192_p8 PASS
+Test 007 cpld_restart_c192_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_control_c384_p8
-Checking test 010 cpld_control_c384_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_bmark_p8
+Checking test 008 cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -613,21 +492,23 @@ Checking test 010 cpld_control_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 1622.694036
-0:The maximum resident set size (KB)                   = 5355204
+0:The total amount of wall time                        = 1717.332308
+0:The maximum resident set size (KB)                   = 5050812
 
-Test 010 cpld_control_c384_p8 PASS
+Test 008 cpld_bmark_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_restart_c384_p8
-Checking test 011 cpld_restart_c384_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_restart_bmark_p8
+Checking test 009 cpld_restart_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -664,31 +545,33 @@ Checking test 011 cpld_restart_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-0:The total amount of wall time                        = 821.425369
-0:The maximum resident set size (KB)                   = 5319128
-
-Test 011 cpld_restart_c384_p8 PASS
-
-
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_debug_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/cpld_debug_p8
-Checking test 012 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+0:The total amount of wall time                        = 1110.729581
+0:The maximum resident set size (KB)                   = 5018028
+
+Test 009 cpld_restart_bmark_p8 PASS
+
+
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_debug_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/cpld_debug_p8
+Checking test 010 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -722,18 +605,20 @@ Checking test 012 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-0:The total amount of wall time                        = 737.228597
-0:The maximum resident set size (KB)                   = 4481436
+0:The total amount of wall time                        = 537.884258
+0:The maximum resident set size (KB)                   = 4493452
 
-Test 012 cpld_debug_p8 PASS
+Test 010 cpld_debug_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control
-Checking test 013 control results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control
+Checking test 011 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -779,15 +664,15 @@ Checking test 013 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 142.716721
-0:The maximum resident set size (KB)                   = 454544
+0:The total amount of wall time                        = 139.855072
+0:The maximum resident set size (KB)                   = 454520
 
-Test 013 control PASS
+Test 011 control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_decomp
-Checking test 014 control_decomp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_decomp
+Checking test 012 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -829,29 +714,29 @@ Checking test 014 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 148.130870
-0:The maximum resident set size (KB)                   = 451044
+0:The total amount of wall time                        = 146.689124
+0:The maximum resident set size (KB)                   = 451012
 
-Test 014 control_decomp PASS
+Test 012 control_decomp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_2dwrtdecomp
-Checking test 015 control_2dwrtdecomp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_2dwrtdecomp
+Checking test 013 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-0:The total amount of wall time                        = 131.920618
-0:The maximum resident set size (KB)                   = 455048
+0:The total amount of wall time                        = 133.885833
+0:The maximum resident set size (KB)                   = 455100
 
-Test 015 control_2dwrtdecomp PASS
+Test 013 control_2dwrtdecomp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_2threads
-Checking test 016 control_2threads results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_2threads
+Checking test 014 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -893,15 +778,15 @@ Checking test 016 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 364.913504
-0:The maximum resident set size (KB)                   = 500092
+0:The total amount of wall time                        = 367.681918
+0:The maximum resident set size (KB)                   = 500052
 
-Test 016 control_2threads PASS
+Test 014 control_2threads PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_restart
-Checking test 017 control_restart results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_restart
+Checking test 015 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -939,15 +824,15 @@ Checking test 017 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 72.094034
-0:The maximum resident set size (KB)                   = 193536
+0:The total amount of wall time                        = 72.381114
+0:The maximum resident set size (KB)                   = 193600
 
-Test 017 control_restart PASS
+Test 015 control_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_fhzero
-Checking test 018 control_fhzero results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_fhzero
+Checking test 016 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -989,15 +874,15 @@ Checking test 018 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 137.114483
-0:The maximum resident set size (KB)                   = 454836
+0:The total amount of wall time                        = 131.707205
+0:The maximum resident set size (KB)                   = 454924
 
-Test 018 control_fhzero PASS
+Test 016 control_fhzero PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_CubedSphereGrid
-Checking test 019 control_CubedSphereGrid results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_CubedSphereGrid
+Checking test 017 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -1023,15 +908,15 @@ Checking test 019 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-0:The total amount of wall time                        = 135.860089
-0:The maximum resident set size (KB)                   = 451980
+0:The total amount of wall time                        = 135.273031
+0:The maximum resident set size (KB)                   = 451932
 
-Test 019 control_CubedSphereGrid PASS
+Test 017 control_CubedSphereGrid PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_latlon
-Checking test 020 control_latlon results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_latlon
+Checking test 018 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1041,15 +926,15 @@ Checking test 020 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 135.306820
-0:The maximum resident set size (KB)                   = 454672
+0:The total amount of wall time                        = 138.415913
+0:The maximum resident set size (KB)                   = 454928
 
-Test 020 control_latlon PASS
+Test 018 control_latlon PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_wrtGauss_netcdf_parallel
-Checking test 021 control_wrtGauss_netcdf_parallel results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_wrtGauss_netcdf_parallel
+Checking test 019 control_wrtGauss_netcdf_parallel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1059,15 +944,15 @@ Checking test 021 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 141.342392
-0:The maximum resident set size (KB)                   = 454420
+0:The total amount of wall time                        = 141.303452
+0:The maximum resident set size (KB)                   = 454556
 
-Test 021 control_wrtGauss_netcdf_parallel PASS
+Test 019 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_c48
-Checking test 022 control_c48 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_c48
+Checking test 020 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1105,15 +990,15 @@ Checking test 022 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 430.172155
-0:The maximum resident set size (KB)                   = 625300
+0:The total amount of wall time                        = 429.524255
+0:The maximum resident set size (KB)                   = 625284
 
-Test 022 control_c48 PASS
+Test 020 control_c48 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_c192
-Checking test 023 control_c192 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_c192
+Checking test 021 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1123,15 +1008,15 @@ Checking test 023 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 571.530254
-0:The maximum resident set size (KB)                   = 557876
+0:The total amount of wall time                        = 569.377571
+0:The maximum resident set size (KB)                   = 557920
 
-Test 023 control_c192 PASS
+Test 021 control_c192 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_c384
-Checking test 024 control_c384 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_c384
+Checking test 022 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1141,15 +1026,15 @@ Checking test 024 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-0:The total amount of wall time                        = 1240.113269
+0:The total amount of wall time                        = 1239.056926
 0:The maximum resident set size (KB)                   = 831080
 
-Test 024 control_c384 PASS
+Test 022 control_c384 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_c384gdas
-Checking test 025 control_c384gdas results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_c384gdas
+Checking test 023 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1191,15 +1076,15 @@ Checking test 025 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 1313.903919
-0:The maximum resident set size (KB)                   = 967388
+0:The total amount of wall time                        = 1312.029567
+0:The maximum resident set size (KB)                   = 967436
 
-Test 025 control_c384gdas PASS
+Test 023 control_c384gdas PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_stochy
-Checking test 026 control_stochy results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_stochy
+Checking test 024 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1209,29 +1094,29 @@ Checking test 026 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-0:The total amount of wall time                        = 92.073719
-0:The maximum resident set size (KB)                   = 457756
+0:The total amount of wall time                        = 92.434818
+0:The maximum resident set size (KB)                   = 457820
 
-Test 026 control_stochy PASS
+Test 024 control_stochy PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_stochy_restart
-Checking test 027 control_stochy_restart results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_stochy_restart
+Checking test 025 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-0:The total amount of wall time                        = 48.366048
-0:The maximum resident set size (KB)                   = 225584
+0:The total amount of wall time                        = 48.499010
+0:The maximum resident set size (KB)                   = 225396
 
-Test 027 control_stochy_restart PASS
+Test 025 control_stochy_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_lndp
-Checking test 028 control_lndp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_lndp
+Checking test 026 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1241,15 +1126,15 @@ Checking test 028 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-0:The total amount of wall time                        = 82.041635
-0:The maximum resident set size (KB)                   = 455192
+0:The total amount of wall time                        = 83.872265
+0:The maximum resident set size (KB)                   = 455244
 
-Test 028 control_lndp PASS
+Test 026 control_lndp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_iovr4
-Checking test 029 control_iovr4 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_iovr4
+Checking test 027 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1263,15 +1148,15 @@ Checking test 029 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 141.264705
-0:The maximum resident set size (KB)                   = 454560
+0:The total amount of wall time                        = 140.144397
+0:The maximum resident set size (KB)                   = 454736
 
-Test 029 control_iovr4 PASS
+Test 027 control_iovr4 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_iovr5
-Checking test 030 control_iovr5 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_iovr5
+Checking test 028 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1285,15 +1170,15 @@ Checking test 030 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 139.635786
-0:The maximum resident set size (KB)                   = 454516
+0:The total amount of wall time                        = 140.216643
+0:The maximum resident set size (KB)                   = 454456
 
-Test 030 control_iovr5 PASS
+Test 028 control_iovr5 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_p8
-Checking test 031 control_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_p8
+Checking test 029 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1339,15 +1224,15 @@ Checking test 031 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 182.602343
-0:The maximum resident set size (KB)                   = 849460
+0:The total amount of wall time                        = 182.300265
+0:The maximum resident set size (KB)                   = 849544
 
-Test 031 control_p8 PASS
+Test 029 control_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_p8_lndp
-Checking test 032 control_p8_lndp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_p8_lndp
+Checking test 030 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1365,15 +1250,15 @@ Checking test 032 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-0:The total amount of wall time                        = 344.741193
-0:The maximum resident set size (KB)                   = 849672
+0:The total amount of wall time                        = 344.419781
+0:The maximum resident set size (KB)                   = 849700
 
-Test 032 control_p8_lndp PASS
+Test 030 control_p8_lndp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_restart_p8
-Checking test 033 control_restart_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_restart_p8
+Checking test 031 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1411,15 +1296,15 @@ Checking test 033 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 98.601896
-0:The maximum resident set size (KB)                   = 579176
+0:The total amount of wall time                        = 97.286723
+0:The maximum resident set size (KB)                   = 579164
 
-Test 033 control_restart_p8 PASS
+Test 031 control_restart_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_decomp_p8
-Checking test 034 control_decomp_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_decomp_p8
+Checking test 032 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1461,15 +1346,15 @@ Checking test 034 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 189.129971
-0:The maximum resident set size (KB)                   = 843460
+0:The total amount of wall time                        = 187.341569
+0:The maximum resident set size (KB)                   = 843416
 
-Test 034 control_decomp_p8 PASS
+Test 032 control_decomp_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_2threads_p8
-Checking test 035 control_2threads_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_2threads_p8
+Checking test 033 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1511,15 +1396,15 @@ Checking test 035 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 493.985312
-0:The maximum resident set size (KB)                   = 916220
+0:The total amount of wall time                        = 496.700347
+0:The maximum resident set size (KB)                   = 916416
 
-Test 035 control_2threads_p8 PASS
+Test 033 control_2threads_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_p8_rrtmgp
-Checking test 036 control_p8_rrtmgp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_p8_rrtmgp
+Checking test 034 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1565,15 +1450,15 @@ Checking test 036 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 245.927843
-0:The maximum resident set size (KB)                   = 965196
+0:The total amount of wall time                        = 238.886085
+0:The maximum resident set size (KB)                   = 965160
 
-Test 036 control_p8_rrtmgp PASS
+Test 034 control_p8_rrtmgp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_control
-Checking test 037 regional_control results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_control
+Checking test 035 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1583,58 +1468,58 @@ Checking test 037 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-0:The total amount of wall time                        = 363.339497
-0:The maximum resident set size (KB)                   = 561908
+0:The total amount of wall time                        = 367.068188
+0:The maximum resident set size (KB)                   = 564136
 
-Test 037 regional_control PASS
+Test 035 regional_control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_restart
-Checking test 038 regional_restart results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_restart
+Checking test 036 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-0:The total amount of wall time                        = 195.013240
-0:The maximum resident set size (KB)                   = 556284
+0:The total amount of wall time                        = 194.051568
+0:The maximum resident set size (KB)                   = 556268
 
-Test 038 regional_restart PASS
+Test 036 regional_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_control_2dwrtdecomp
-Checking test 039 regional_control_2dwrtdecomp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_control_2dwrtdecomp
+Checking test 037 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-0:The total amount of wall time                        = 357.867346
-0:The maximum resident set size (KB)                   = 563328
+0:The total amount of wall time                        = 358.828635
+0:The maximum resident set size (KB)                   = 563312
 
-Test 039 regional_control_2dwrtdecomp PASS
+Test 037 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_noquilt
-Checking test 040 regional_noquilt results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_noquilt
+Checking test 038 regional_noquilt 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                        = 378.054581
-0:The maximum resident set size (KB)                   = 557588
+0:The total amount of wall time                        = 383.553616
+0:The maximum resident set size (KB)                   = 557496
 
-Test 040 regional_noquilt PASS
+Test 038 regional_noquilt PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_2threads
-Checking test 041 regional_2threads results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_2threads
+Checking test 039 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1644,29 +1529,29 @@ Checking test 041 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-0:The total amount of wall time                        = 1169.167874
-0:The maximum resident set size (KB)                   = 558076
+0:The total amount of wall time                        = 1170.744367
+0:The maximum resident set size (KB)                   = 557744
 
-Test 041 regional_2threads PASS
+Test 039 regional_2threads PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_netcdf_parallel
-Checking test 042 regional_netcdf_parallel results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_netcdf_parallel
+Checking test 040 regional_netcdf_parallel results ....
  Comparing dynf000.nc ............ALT CHECK......OK
  Comparing dynf024.nc .........OK
- Comparing phyf000.nc ............ALT CHECK......OK
+ Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-0:The total amount of wall time                        = 360.150085
-0:The maximum resident set size (KB)                   = 554376
+0:The total amount of wall time                        = 359.475535
+0:The maximum resident set size (KB)                   = 554400
 
-Test 042 regional_netcdf_parallel PASS
+Test 040 regional_netcdf_parallel PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_3km
-Checking test 043 regional_3km results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_3km
+Checking test 041 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1676,15 +1561,15 @@ Checking test 043 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-0:The total amount of wall time                        = 286.757786
-0:The maximum resident set size (KB)                   = 595656
+0:The total amount of wall time                        = 295.906606
+0:The maximum resident set size (KB)                   = 595608
 
-Test 043 regional_3km PASS
+Test 041 regional_3km PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_control
-Checking test 044 rap_control results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_control
+Checking test 042 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1730,15 +1615,15 @@ Checking test 044 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 454.391535
-0:The maximum resident set size (KB)                   = 822124
+0:The total amount of wall time                        = 459.041885
+0:The maximum resident set size (KB)                   = 822036
 
-Test 044 rap_control PASS
+Test 042 rap_control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_rrtmgp
-Checking test 045 rap_rrtmgp results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_rrtmgp
+Checking test 043 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1784,15 +1669,15 @@ Checking test 045 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 521.691254
-0:The maximum resident set size (KB)                   = 950656
+0:The total amount of wall time                        = 518.793670
+0:The maximum resident set size (KB)                   = 950700
 
-Test 045 rap_rrtmgp PASS
+Test 043 rap_rrtmgp PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_spp_sppt_shum_skeb
-Checking test 046 regional_spp_sppt_shum_skeb results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_spp_sppt_shum_skeb
+Checking test 044 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1802,15 +1687,15 @@ Checking test 046 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-0:The total amount of wall time                        = 691.778381
-0:The maximum resident set size (KB)                   = 930984
+0:The total amount of wall time                        = 700.971812
+0:The maximum resident set size (KB)                   = 930812
 
-Test 046 regional_spp_sppt_shum_skeb PASS
+Test 044 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_2threads
-Checking test 047 rap_2threads results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_2threads
+Checking test 045 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1856,15 +1741,15 @@ Checking test 047 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 1084.630184
-0:The maximum resident set size (KB)                   = 879356
+0:The total amount of wall time                        = 1096.196339
+0:The maximum resident set size (KB)                   = 879304
 
-Test 047 rap_2threads PASS
+Test 045 rap_2threads PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_restart
-Checking test 048 rap_restart results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_restart
+Checking test 046 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1902,15 +1787,15 @@ Checking test 048 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 231.714638
-0:The maximum resident set size (KB)                   = 566052
+0:The total amount of wall time                        = 231.057314
+0:The maximum resident set size (KB)                   = 566064
 
-Test 048 rap_restart PASS
+Test 046 rap_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_sfcdiff
-Checking test 049 rap_sfcdiff results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_sfcdiff
+Checking test 047 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1956,15 +1841,15 @@ Checking test 049 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 455.648133
-0:The maximum resident set size (KB)                   = 822024
+0:The total amount of wall time                        = 460.024871
+0:The maximum resident set size (KB)                   = 822132
 
-Test 049 rap_sfcdiff PASS
+Test 047 rap_sfcdiff PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_sfcdiff_restart
-Checking test 050 rap_sfcdiff_restart results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_sfcdiff_restart
+Checking test 048 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -2002,15 +1887,15 @@ Checking test 050 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 232.335135
-0:The maximum resident set size (KB)                   = 565948
+0:The total amount of wall time                        = 231.094088
+0:The maximum resident set size (KB)                   = 565984
 
-Test 050 rap_sfcdiff_restart PASS
+Test 048 rap_sfcdiff_restart PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hrrr_control
-Checking test 051 hrrr_control results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hrrr_control
+Checking test 049 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2056,15 +1941,15 @@ Checking test 051 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 439.426049
-0:The maximum resident set size (KB)                   = 822220
+0:The total amount of wall time                        = 433.788353
+0:The maximum resident set size (KB)                   = 822320
 
-Test 051 hrrr_control PASS
+Test 049 hrrr_control PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_v1beta
-Checking test 052 rrfs_v1beta results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_v1beta
+Checking test 050 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2110,15 +1995,15 @@ Checking test 052 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 450.493242
-0:The maximum resident set size (KB)                   = 816920
+0:The total amount of wall time                        = 449.575874
+0:The maximum resident set size (KB)                   = 816872
 
-Test 052 rrfs_v1beta PASS
+Test 050 rrfs_v1beta PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_v1nssl
-Checking test 053 rrfs_v1nssl results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_v1nssl
+Checking test 051 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2132,15 +2017,15 @@ Checking test 053 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 551.369077
-0:The maximum resident set size (KB)                   = 506368
+0:The total amount of wall time                        = 553.585286
+0:The maximum resident set size (KB)                   = 506472
 
-Test 053 rrfs_v1nssl PASS
+Test 051 rrfs_v1nssl PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_v1nssl_nohailnoccn
-Checking test 054 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_v1nssl_nohailnoccn
+Checking test 052 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2154,15 +2039,15 @@ Checking test 054 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 537.468382
-0:The maximum resident set size (KB)                   = 502136
+0:The total amount of wall time                        = 536.833630
+0:The maximum resident set size (KB)                   = 502192
 
-Test 054 rrfs_v1nssl_nohailnoccn PASS
+Test 052 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_conus13km_hrrr_warm
-Checking test 055 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_conus13km_hrrr_warm
+Checking test 053 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2170,15 +2055,15 @@ Checking test 055 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 199.323682
-0:The maximum resident set size (KB)                   = 638144
+0:The total amount of wall time                        = 193.505172
+0:The maximum resident set size (KB)                   = 638172
 
-Test 055 rrfs_conus13km_hrrr_warm PASS
+Test 053 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_conus13km_radar_tten_warm
-Checking test 056 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_conus13km_radar_tten_warm
+Checking test 054 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2186,15 +2071,15 @@ Checking test 056 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 191.827746
-0:The maximum resident set size (KB)                   = 639948
+0:The total amount of wall time                        = 195.363660
+0:The maximum resident set size (KB)                   = 639984
 
-Test 056 rrfs_conus13km_radar_tten_warm PASS
+Test 054 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_smoke_conus13km_hrrr_warm
-Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_smoke_conus13km_hrrr_warm
+Checking test 055 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2202,15 +2087,15 @@ Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-0:The total amount of wall time                        = 216.756240
-0:The maximum resident set size (KB)                   = 653408
+0:The total amount of wall time                        = 217.488048
+0:The maximum resident set size (KB)                   = 653048
 
-Test 057 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 055 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_csawmg
-Checking test 058 control_csawmg results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_csawmg
+Checking test 056 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2220,15 +2105,15 @@ Checking test 058 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 388.392608
-0:The maximum resident set size (KB)                   = 529840
+0:The total amount of wall time                        = 386.971279
+0:The maximum resident set size (KB)                   = 529852
 
-Test 058 control_csawmg PASS
+Test 056 control_csawmg PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_csawmgt
-Checking test 059 control_csawmgt results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_csawmgt
+Checking test 057 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2238,15 +2123,15 @@ Checking test 059 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 384.197469
-0:The maximum resident set size (KB)                   = 529968
+0:The total amount of wall time                        = 383.607824
+0:The maximum resident set size (KB)                   = 529584
 
-Test 059 control_csawmgt PASS
+Test 057 control_csawmgt PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_flake
-Checking test 060 control_flake results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_flake
+Checking test 058 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2256,15 +2141,15 @@ Checking test 060 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 246.471750
-0:The maximum resident set size (KB)                   = 524764
+0:The total amount of wall time                        = 251.293984
+0:The maximum resident set size (KB)                   = 524728
 
-Test 060 control_flake PASS
+Test 058 control_flake PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_ras
-Checking test 061 control_ras results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_ras
+Checking test 059 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2274,15 +2159,15 @@ Checking test 061 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 196.529442
-0:The maximum resident set size (KB)                   = 486804
+0:The total amount of wall time                        = 194.202804
+0:The maximum resident set size (KB)                   = 486724
 
-Test 061 control_ras PASS
+Test 059 control_ras PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson
-Checking test 062 control_thompson results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson
+Checking test 060 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2292,15 +2177,15 @@ Checking test 062 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 270.661466
-0:The maximum resident set size (KB)                   = 838764
+0:The total amount of wall time                        = 257.374737
+0:The maximum resident set size (KB)                   = 838568
 
-Test 062 control_thompson PASS
+Test 060 control_thompson PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson_no_aero
-Checking test 063 control_thompson_no_aero results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson_no_aero
+Checking test 061 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2310,55 +2195,55 @@ Checking test 063 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-0:The total amount of wall time                        = 253.894886
-0:The maximum resident set size (KB)                   = 830004
+0:The total amount of wall time                        = 251.652628
+0:The maximum resident set size (KB)                   = 830064
 
-Test 063 control_thompson_no_aero PASS
+Test 061 control_thompson_no_aero PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_wam
-Checking test 064 control_wam results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_wam
+Checking test 062 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-0:The total amount of wall time                        = 114.188739
-0:The maximum resident set size (KB)                   = 203260
+0:The total amount of wall time                        = 119.966563
+0:The maximum resident set size (KB)                   = 203592
 
-Test 064 control_wam PASS
+Test 062 control_wam PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_debug
-Checking test 065 control_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_debug
+Checking test 063 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 156.961277
-0:The maximum resident set size (KB)                   = 618616
+0:The total amount of wall time                        = 159.936253
+0:The maximum resident set size (KB)                   = 619032
 
-Test 065 control_debug PASS
+Test 063 control_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_2threads_debug
-Checking test 066 control_2threads_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_2threads_debug
+Checking test 064 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 276.166117
-0:The maximum resident set size (KB)                   = 668700
+0:The total amount of wall time                        = 276.358080
+0:The maximum resident set size (KB)                   = 668600
 
-Test 066 control_2threads_debug PASS
+Test 064 control_2threads_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_CubedSphereGrid_debug
-Checking test 067 control_CubedSphereGrid_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_CubedSphereGrid_debug
+Checking test 065 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -2384,736 +2269,740 @@ Checking test 067 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-0:The total amount of wall time                        = 171.069396
-0:The maximum resident set size (KB)                   = 620776
+0:The total amount of wall time                        = 171.014665
+0:The maximum resident set size (KB)                   = 620832
 
-Test 067 control_CubedSphereGrid_debug PASS
+Test 065 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_wrtGauss_netcdf_parallel_debug
-Checking test 068 control_wrtGauss_netcdf_parallel_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_wrtGauss_netcdf_parallel_debug
+Checking test 066 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 161.848492
-0:The maximum resident set size (KB)                   = 618576
+0:The total amount of wall time                        = 163.208877
+0:The maximum resident set size (KB)                   = 618640
 
-Test 068 control_wrtGauss_netcdf_parallel_debug PASS
+Test 066 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_stochy_debug
-Checking test 069 control_stochy_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_stochy_debug
+Checking test 067 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 179.099997
-0:The maximum resident set size (KB)                   = 625276
+0:The total amount of wall time                        = 179.267864
+0:The maximum resident set size (KB)                   = 625248
 
-Test 069 control_stochy_debug PASS
+Test 067 control_stochy_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_lndp_debug
-Checking test 070 control_lndp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_lndp_debug
+Checking test 068 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 161.585370
-0:The maximum resident set size (KB)                   = 623664
+0:The total amount of wall time                        = 161.318137
+0:The maximum resident set size (KB)                   = 623684
 
-Test 070 control_lndp_debug PASS
+Test 068 control_lndp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_csawmg_debug
-Checking test 071 control_csawmg_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_csawmg_debug
+Checking test 069 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 256.886690
+0:The total amount of wall time                        = 253.767307
 0:The maximum resident set size (KB)                   = 670948
 
-Test 071 control_csawmg_debug PASS
+Test 069 control_csawmg_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_csawmgt_debug
-Checking test 072 control_csawmgt_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_csawmgt_debug
+Checking test 070 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 251.182804
-0:The maximum resident set size (KB)                   = 668912
+0:The total amount of wall time                        = 247.951353
+0:The maximum resident set size (KB)                   = 668952
 
-Test 072 control_csawmgt_debug PASS
+Test 070 control_csawmgt_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_ras_debug
-Checking test 073 control_ras_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_ras_debug
+Checking test 071 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 163.663718
-0:The maximum resident set size (KB)                   = 632784
+0:The total amount of wall time                        = 163.795980
+0:The maximum resident set size (KB)                   = 632832
 
-Test 073 control_ras_debug PASS
+Test 071 control_ras_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_diag_debug
-Checking test 074 control_diag_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_diag_debug
+Checking test 072 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 166.063744
-0:The maximum resident set size (KB)                   = 678996
+0:The total amount of wall time                        = 164.842842
+0:The maximum resident set size (KB)                   = 678876
 
-Test 074 control_diag_debug PASS
+Test 072 control_diag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_debug_p8
-Checking test 075 control_debug_p8 results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_debug_p8
+Checking test 073 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 180.718843
-0:The maximum resident set size (KB)                   = 1014164
+0:The total amount of wall time                        = 178.342251
+0:The maximum resident set size (KB)                   = 1014536
 
-Test 075 control_debug_p8 PASS
+Test 073 control_debug_p8 PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson_debug
-Checking test 076 control_thompson_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson_debug
+Checking test 074 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 186.256073
-0:The maximum resident set size (KB)                   = 979128
+0:The total amount of wall time                        = 185.397458
+0:The maximum resident set size (KB)                   = 979232
 
-Test 076 control_thompson_debug PASS
+Test 074 control_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson_no_aero_debug
-Checking test 077 control_thompson_no_aero_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson_no_aero_debug
+Checking test 075 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 183.995891
-0:The maximum resident set size (KB)                   = 976352
+0:The total amount of wall time                        = 178.989856
+0:The maximum resident set size (KB)                   = 976192
 
-Test 077 control_thompson_no_aero_debug PASS
+Test 075 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson_extdiag_debug
-Checking test 078 control_thompson_extdiag_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson_extdiag_debug
+Checking test 076 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 196.901758
-0:The maximum resident set size (KB)                   = 1008576
+0:The total amount of wall time                        = 195.041032
+0:The maximum resident set size (KB)                   = 1008104
 
-Test 078 control_thompson_extdiag_debug PASS
+Test 076 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_thompson_progcld_thompson_debug
-Checking test 079 control_thompson_progcld_thompson_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_thompson_progcld_thompson_debug
+Checking test 077 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 186.763011
-0:The maximum resident set size (KB)                   = 979204
+0:The total amount of wall time                        = 185.585598
+0:The maximum resident set size (KB)                   = 979252
 
-Test 079 control_thompson_progcld_thompson_debug PASS
+Test 077 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/regional_debug
-Checking test 080 regional_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/regional_debug
+Checking test 078 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
-0:The total amount of wall time                        = 261.921452
-0:The maximum resident set size (KB)                   = 588240
+0:The total amount of wall time                        = 259.493259
+0:The maximum resident set size (KB)                   = 588216
 
-Test 080 regional_debug PASS
+Test 078 regional_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_control_debug
-Checking test 081 rap_control_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_control_debug
+Checking test 079 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 286.205585
-0:The maximum resident set size (KB)                   = 988064
+0:The total amount of wall time                        = 286.996021
+0:The maximum resident set size (KB)                   = 988252
 
-Test 081 rap_control_debug PASS
+Test 079 rap_control_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_unified_drag_suite_debug
-Checking test 082 rap_unified_drag_suite_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_unified_drag_suite_debug
+Checking test 080 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 287.795080
-0:The maximum resident set size (KB)                   = 988124
+0:The total amount of wall time                        = 285.853102
+0:The maximum resident set size (KB)                   = 988272
 
-Test 082 rap_unified_drag_suite_debug PASS
+Test 080 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_diag_debug
-Checking test 083 rap_diag_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_diag_debug
+Checking test 081 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 298.696845
-0:The maximum resident set size (KB)                   = 1070160
+0:The total amount of wall time                        = 301.266006
+0:The maximum resident set size (KB)                   = 1070576
 
-Test 083 rap_diag_debug PASS
+Test 081 rap_diag_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_cires_ugwp_debug
-Checking test 084 rap_cires_ugwp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_cires_ugwp_debug
+Checking test 082 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 293.864792
-0:The maximum resident set size (KB)                   = 986432
+0:The total amount of wall time                        = 291.456494
+0:The maximum resident set size (KB)                   = 986436
 
-Test 084 rap_cires_ugwp_debug PASS
+Test 082 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_unified_ugwp_debug
-Checking test 085 rap_unified_ugwp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_unified_ugwp_debug
+Checking test 083 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 291.392933
-0:The maximum resident set size (KB)                   = 988140
+0:The total amount of wall time                        = 291.960279
+0:The maximum resident set size (KB)                   = 988180
 
-Test 085 rap_unified_ugwp_debug PASS
+Test 083 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_lndp_debug
-Checking test 086 rap_lndp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_lndp_debug
+Checking test 084 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 289.644962
-0:The maximum resident set size (KB)                   = 988792
+0:The total amount of wall time                        = 289.093032
+0:The maximum resident set size (KB)                   = 988868
 
-Test 086 rap_lndp_debug PASS
+Test 084 rap_lndp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_flake_debug
-Checking test 087 rap_flake_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_flake_debug
+Checking test 085 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 289.152906
-0:The maximum resident set size (KB)                   = 988144
+0:The total amount of wall time                        = 286.117511
+0:The maximum resident set size (KB)                   = 988100
 
-Test 087 rap_flake_debug PASS
+Test 085 rap_flake_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_progcld_thompson_debug
-Checking test 088 rap_progcld_thompson_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_progcld_thompson_debug
+Checking test 086 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 288.553362
-0:The maximum resident set size (KB)                   = 988204
+0:The total amount of wall time                        = 286.643547
+0:The maximum resident set size (KB)                   = 988064
 
-Test 088 rap_progcld_thompson_debug PASS
+Test 086 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_noah_debug
-Checking test 089 rap_noah_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_noah_debug
+Checking test 087 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 282.134787
-0:The maximum resident set size (KB)                   = 987172
+0:The total amount of wall time                        = 282.217143
+0:The maximum resident set size (KB)                   = 987132
 
-Test 089 rap_noah_debug PASS
+Test 087 rap_noah_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_rrtmgp_debug
-Checking test 090 rap_rrtmgp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_rrtmgp_debug
+Checking test 088 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 486.836523
-0:The maximum resident set size (KB)                   = 1117496
+0:The total amount of wall time                        = 481.891814
+0:The maximum resident set size (KB)                   = 1117136
 
-Test 090 rap_rrtmgp_debug PASS
+Test 088 rap_rrtmgp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_sfcdiff_debug
-Checking test 091 rap_sfcdiff_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_sfcdiff_debug
+Checking test 089 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 287.083712
-0:The maximum resident set size (KB)                   = 987952
+0:The total amount of wall time                        = 287.524282
+0:The maximum resident set size (KB)                   = 987812
 
-Test 091 rap_sfcdiff_debug PASS
+Test 089 rap_sfcdiff_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 092 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 090 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 471.355633
-0:The maximum resident set size (KB)                   = 985648
+0:The total amount of wall time                        = 473.389180
+0:The maximum resident set size (KB)                   = 985736
 
-Test 092 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 090 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/rrfs_v1beta_debug
-Checking test 093 rrfs_v1beta_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/rrfs_v1beta_debug
+Checking test 091 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-0:The total amount of wall time                        = 286.237510
-0:The maximum resident set size (KB)                   = 983272
+0:The total amount of wall time                        = 284.981124
+0:The maximum resident set size (KB)                   = 983332
 
-Test 093 rrfs_v1beta_debug PASS
+Test 091 rrfs_v1beta_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_wam_debug
-Checking test 094 control_wam_debug results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_wam_debug
+Checking test 092 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-0:The total amount of wall time                        = 294.417036
-0:The maximum resident set size (KB)                   = 237160
+0:The total amount of wall time                        = 294.887237
+0:The maximum resident set size (KB)                   = 237028
 
-Test 094 control_wam_debug PASS
+Test 092 control_wam_debug PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_atm
-Checking test 095 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_atm
+Checking test 093 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-0:The total amount of wall time                        = 631.875719
-0:The maximum resident set size (KB)                   = 685608
+0:The total amount of wall time                        = 632.030317
+0:The maximum resident set size (KB)                   = 685484
 
-Test 095 hafs_regional_atm PASS
+Test 093 hafs_regional_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_atm_thompson_gfdlsf
-Checking test 096 hafs_regional_atm_thompson_gfdlsf results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_atm_thompson_gfdlsf
+Checking test 094 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-0:The total amount of wall time                        = 717.746688
-0:The maximum resident set size (KB)                   = 1055532
+0:The total amount of wall time                        = 696.332098
+0:The maximum resident set size (KB)                   = 1055504
 
-Test 096 hafs_regional_atm_thompson_gfdlsf PASS
+Test 094 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_atm_ocn
-Checking test 097 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_atm_ocn
+Checking test 095 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-0:The total amount of wall time                        = 470.731526
-0:The maximum resident set size (KB)                   = 719608
+0:The total amount of wall time                        = 468.071454
+0:The maximum resident set size (KB)                   = 719616
 
-Test 097 hafs_regional_atm_ocn PASS
+Test 095 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_atm_wav
-Checking test 098 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_atm_wav
+Checking test 096 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-0:The total amount of wall time                        = 1087.518803
-0:The maximum resident set size (KB)                   = 712060
+0:The total amount of wall time                        = 1060.389169
+0:The maximum resident set size (KB)                   = 745316
 
-Test 098 hafs_regional_atm_wav PASS
+Test 096 hafs_regional_atm_wav PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_atm_ocn_wav
-Checking test 099 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_atm_ocn_wav
+Checking test 097 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-0:The total amount of wall time                        = 1140.242408
-0:The maximum resident set size (KB)                   = 732728
+0:The total amount of wall time                        = 1142.875000
+0:The maximum resident set size (KB)                   = 763728
 
-Test 099 hafs_regional_atm_ocn_wav PASS
+Test 097 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_1nest_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_1nest_atm
-Checking test 100 hafs_regional_1nest_atm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_1nest_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_1nest_atm
+Checking test 098 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-0:The total amount of wall time                        = 1331.609569
-0:The maximum resident set size (KB)                   = 274928
+0:The total amount of wall time                        = 1329.599356
+0:The maximum resident set size (KB)                   = 274968
 
-Test 100 hafs_regional_1nest_atm PASS
+Test 098 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_telescopic_2nests_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_telescopic_2nests_atm
-Checking test 101 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_telescopic_2nests_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_telescopic_2nests_atm
+Checking test 099 hafs_regional_telescopic_2nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-0:The total amount of wall time                        = 1425.330088
-0:The maximum resident set size (KB)                   = 286960
+0:The total amount of wall time                        = 1429.493412
+0:The maximum resident set size (KB)                   = 286764
 
-Test 101 hafs_regional_telescopic_2nests_atm PASS
+Test 099 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_1nest_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_global_1nest_atm
-Checking test 102 hafs_global_1nest_atm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_1nest_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_global_1nest_atm
+Checking test 100 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-0:The total amount of wall time                        = 830.889288
-0:The maximum resident set size (KB)                   = 184208
+0:The total amount of wall time                        = 826.269317
+0:The maximum resident set size (KB)                   = 184268
 
-Test 102 hafs_global_1nest_atm PASS
+Test 100 hafs_global_1nest_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_multiple_4nests_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_global_multiple_4nests_atm
-Checking test 103 hafs_global_multiple_4nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_multiple_4nests_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_global_multiple_4nests_atm
+Checking test 101 hafs_global_multiple_4nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing atm.nest05.f006.nc .........OK
- Comparing sfc.nest05.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest05.f006.nc .........OK
 
-0:The total amount of wall time                        = 1412.612555
-0:The maximum resident set size (KB)                   = 262552
+0:The total amount of wall time                        = 1416.047699
+0:The maximum resident set size (KB)                   = 262440
 
-Test 103 hafs_global_multiple_4nests_atm PASS
+Test 101 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_specified_moving_1nest_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_specified_moving_1nest_atm
-Checking test 104 hafs_regional_specified_moving_1nest_atm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_specified_moving_1nest_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_specified_moving_1nest_atm
+Checking test 102 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-0:The total amount of wall time                        = 731.490830
-0:The maximum resident set size (KB)                   = 285656
+0:The total amount of wall time                        = 731.945650
+0:The maximum resident set size (KB)                   = 285272
 
-Test 104 hafs_regional_specified_moving_1nest_atm PASS
+Test 102 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_storm_following_1nest_atm
-Checking test 105 hafs_regional_storm_following_1nest_atm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_storm_following_1nest_atm
+Checking test 103 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-0:The total amount of wall time                        = 721.860655
-0:The maximum resident set size (KB)                   = 285704
+0:The total amount of wall time                        = 722.255746
+0:The maximum resident set size (KB)                   = 285468
 
-Test 105 hafs_regional_storm_following_1nest_atm PASS
+Test 103 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_storm_following_1nest_atm_ocn
-Checking test 106 hafs_regional_storm_following_1nest_atm_ocn results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_storm_following_1nest_atm_ocn
+Checking test 104 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-0:The total amount of wall time                        = 743.100966
-0:The maximum resident set size (KB)                   = 318532
+0:The total amount of wall time                        = 736.075805
+0:The maximum resident set size (KB)                   = 318472
 
-Test 106 hafs_regional_storm_following_1nest_atm_ocn PASS
+Test 104 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_storm_following_1nest_atm_ocn_wav
-Checking test 107 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_storm_following_1nest_atm_ocn_wav
+Checking test 105 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-0:The total amount of wall time                        = 1313.327096
-0:The maximum resident set size (KB)                   = 338372
+0:The total amount of wall time                        = 1332.335949
+0:The maximum resident set size (KB)                   = 388740
 
-Test 107 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
+Test 105 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_storm_following_1nest_atm
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_global_storm_following_1nest_atm
-Checking test 108 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_storm_following_1nest_atm
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_global_storm_following_1nest_atm
+Checking test 106 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-0:The total amount of wall time                        = 416.066518
-0:The maximum resident set size (KB)                   = 203156
+0:The total amount of wall time                        = 414.742644
+0:The maximum resident set size (KB)                   = 203148
 
-Test 108 hafs_global_storm_following_1nest_atm PASS
+Test 106 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_docn
-Checking test 109 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_docn
+Checking test 107 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-0:The total amount of wall time                        = 419.689259
-0:The maximum resident set size (KB)                   = 736296
+0:The total amount of wall time                        = 415.247445
+0:The maximum resident set size (KB)                   = 736256
 
-Test 109 hafs_regional_docn PASS
+Test 107 hafs_regional_docn PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_docn_oisst
-Checking test 110 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_docn_oisst
+Checking test 108 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-0:The total amount of wall time                        = 418.746039
-0:The maximum resident set size (KB)                   = 715568
+0:The total amount of wall time                        = 413.370022
+0:The maximum resident set size (KB)                   = 715652
 
-Test 110 hafs_regional_docn_oisst PASS
+Test 108 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/hafs_regional_datm_cdeps
-Checking test 111 hafs_regional_datm_cdeps results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/hafs_regional_datm_cdeps
+Checking test 109 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-0:The total amount of wall time                        = 1163.773968
-0:The maximum resident set size (KB)                   = 867620
+0:The total amount of wall time                        = 1280.231726
+0:The maximum resident set size (KB)                   = 867584
 
-Test 111 hafs_regional_datm_cdeps PASS
+Test 109 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_control_cfsr
-Checking test 112 datm_cdeps_control_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_control_cfsr
+Checking test 110 datm_cdeps_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                        = 161.039871
-0:The maximum resident set size (KB)                   = 680576
+0:The total amount of wall time                        = 160.778003
+0:The maximum resident set size (KB)                   = 680616
 
-Test 112 datm_cdeps_control_cfsr PASS
+Test 110 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_restart_cfsr
-Checking test 113 datm_cdeps_restart_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_restart_cfsr
+Checking test 111 datm_cdeps_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                        = 102.315257
-0:The maximum resident set size (KB)                   = 681532
+0:The total amount of wall time                        = 101.308648
+0:The maximum resident set size (KB)                   = 680852
 
-Test 113 datm_cdeps_restart_cfsr PASS
+Test 111 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_gefs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_control_gefs
-Checking test 114 datm_cdeps_control_gefs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_gefs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_control_gefs
+Checking test 112 datm_cdeps_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                        = 161.774922
-0:The maximum resident set size (KB)                   = 578416
+0:The total amount of wall time                        = 162.323190
+0:The maximum resident set size (KB)                   = 578488
 
-Test 114 datm_cdeps_control_gefs PASS
+Test 112 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_iau_gefs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_iau_gefs
-Checking test 115 datm_cdeps_iau_gefs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_iau_gefs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_iau_gefs
+Checking test 113 datm_cdeps_iau_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                        = 163.741919
-0:The maximum resident set size (KB)                   = 578420
+0:The total amount of wall time                        = 163.271412
+0:The maximum resident set size (KB)                   = 578428
 
-Test 115 datm_cdeps_iau_gefs PASS
+Test 113 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_stochy_gefs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_stochy_gefs
-Checking test 116 datm_cdeps_stochy_gefs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_stochy_gefs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_stochy_gefs
+Checking test 114 datm_cdeps_stochy_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                        = 162.495177
-0:The maximum resident set size (KB)                   = 578432
+0:The total amount of wall time                        = 164.911297
+0:The maximum resident set size (KB)                   = 578416
 
-Test 116 datm_cdeps_stochy_gefs PASS
+Test 114 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_bulk_cfsr
-Checking test 117 datm_cdeps_bulk_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_bulk_cfsr
+Checking test 115 datm_cdeps_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                        = 160.673784
-0:The maximum resident set size (KB)                   = 680564
+0:The total amount of wall time                        = 168.015908
+0:The maximum resident set size (KB)                   = 691604
 
-Test 117 datm_cdeps_bulk_cfsr PASS
+Test 115 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_gefs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_bulk_gefs
-Checking test 118 datm_cdeps_bulk_gefs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_gefs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_bulk_gefs
+Checking test 116 datm_cdeps_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                        = 160.408932
-0:The maximum resident set size (KB)                   = 578448
+0:The total amount of wall time                        = 160.618689
+0:The maximum resident set size (KB)                   = 578400
 
-Test 118 datm_cdeps_bulk_gefs PASS
+Test 116 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_mx025_cfsr
-Checking test 119 datm_cdeps_mx025_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_mx025_cfsr
+Checking test 117 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3121,15 +3010,15 @@ Checking test 119 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-0:The total amount of wall time                        = 353.092163
-0:The maximum resident set size (KB)                   = 500912
+0:The total amount of wall time                        = 355.356954
+0:The maximum resident set size (KB)                   = 500888
 
-Test 119 datm_cdeps_mx025_cfsr PASS
+Test 117 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_gefs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_mx025_gefs
-Checking test 120 datm_cdeps_mx025_gefs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_gefs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_mx025_gefs
+Checking test 118 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3137,65 +3026,65 @@ Checking test 120 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-0:The total amount of wall time                        = 353.006158
-0:The maximum resident set size (KB)                   = 475088
+0:The total amount of wall time                        = 347.829022
+0:The maximum resident set size (KB)                   = 475096
 
-Test 120 datm_cdeps_mx025_gefs PASS
+Test 118 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_multiple_files_cfsr
-Checking test 121 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_multiple_files_cfsr
+Checking test 119 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-0:The total amount of wall time                        = 166.295277
-0:The maximum resident set size (KB)                   = 692056
+0:The total amount of wall time                        = 167.101387
+0:The maximum resident set size (KB)                   = 680536
 
-Test 121 datm_cdeps_multiple_files_cfsr PASS
+Test 119 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_3072x1536_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_3072x1536_cfsr
-Checking test 122 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_3072x1536_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_3072x1536_cfsr
+Checking test 120 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
-0:The total amount of wall time                        = 237.376298
-0:The maximum resident set size (KB)                   = 1825888
+0:The total amount of wall time                        = 268.450252
+0:The maximum resident set size (KB)                   = 1826124
 
-Test 122 datm_cdeps_3072x1536_cfsr PASS
+Test 120 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_gfs
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_gfs
-Checking test 123 datm_cdeps_gfs results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_gfs
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_gfs
+Checking test 121 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
-0:The total amount of wall time                        = 255.186013
-0:The maximum resident set size (KB)                   = 1794716
+0:The total amount of wall time                        = 254.573359
+0:The maximum resident set size (KB)                   = 1826412
 
-Test 123 datm_cdeps_gfs PASS
+Test 121 datm_cdeps_gfs PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_debug_cfsr
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/datm_cdeps_debug_cfsr
-Checking test 124 datm_cdeps_debug_cfsr results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_debug_cfsr
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/datm_cdeps_debug_cfsr
+Checking test 122 datm_cdeps_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                        = 453.342855
-0:The maximum resident set size (KB)                   = 699808
+0:The total amount of wall time                        = 453.819181
+0:The maximum resident set size (KB)                   = 688908
 
-Test 124 datm_cdeps_debug_cfsr PASS
+Test 122 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atmwav
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_atmwav
-Checking test 125 control_atmwav results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atmwav
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_atmwav
+Checking test 123 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3238,15 +3127,15 @@ Checking test 125 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-0:The total amount of wall time                        = 95.088140
-0:The maximum resident set size (KB)                   = 477592
+0:The total amount of wall time                        = 94.927821
+0:The maximum resident set size (KB)                   = 477512
 
-Test 125 control_atmwav PASS
+Test 123 control_atmwav PASS
 
 
-baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atm_aerosols
-working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_67719/control_atm_aerosols
-Checking test 126 control_atm_aerosols results ....
+baseline dir = /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atm_aerosols
+working dir  = /glade/scratch/epicufsrt/FV3_RT/rt_53905/control_atm_aerosols
+Checking test 124 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3289,12 +3178,12 @@ Checking test 126 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0:The total amount of wall time                        = 415.408986
-0:The maximum resident set size (KB)                   = 4360444
+0:The total amount of wall time                        = 385.246677
+0:The maximum resident set size (KB)                   = 4360440
 
-Test 126 control_atm_aerosols PASS
+Test 124 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 09:27:55 MDT 2022
-Elapsed time: 02h:11m:30s. Have a nice day!
+Sun May 29 20:34:44 MDT 2022
+Elapsed time: 01h:29m:12s. Have a nice day!
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
index 9abf34b57d..39404efd3d 100644
--- a/tests/RegressionTests_gaea.intel.log
+++ b/tests/RegressionTests_gaea.intel.log
@@ -1,25 +1,25 @@
-Fri May 27 16:17:13 EDT 2022
+Mon May 30 08:59:00 EDT 2022
 Start Regression test
 
-Compile 001 elapsed time 685 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 002 elapsed time 252 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 463 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 470 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 479 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 006 elapsed time 407 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 007 elapsed time 235 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 215 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 234 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 203 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 606 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 012 elapsed time 588 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 013 elapsed time 249 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 014 elapsed time 148 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 537 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 016 elapsed time 429 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_control_p8
+Compile 001 elapsed time 683 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 002 elapsed time 289 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 461 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 494 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 486 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 006 elapsed time 440 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 007 elapsed time 248 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 240 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 237 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 010 elapsed time 226 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 615 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 012 elapsed time 610 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 013 elapsed time 248 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 014 elapsed time 177 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 015 elapsed time 606 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 016 elapsed time 424 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 424.563210
-  0: The maximum resident set size (KB)                   = 1644284
+  0: The total amount of wall time                        = 442.223402
+  0: The maximum resident set size (KB)                   = 1605796
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,6 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -141,20 +141,18 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 571.173931
-  0: The maximum resident set size (KB)                   = 2425276
+  0: The total amount of wall time                        = 279.888813
+  0: The maximum resident set size (KB)                   = 1556664
 
-Test 002 cpld_2threads_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_decomp_p8
-Checking test 003 cpld_decomp_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -167,6 +165,7 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,20 +201,18 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 422.048094
-  0: The maximum resident set size (KB)                   = 1651880
+  0: The total amount of wall time                        = 587.304707
+  0: The maximum resident set size (KB)                   = 2432392
 
-Test 003 cpld_decomp_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_mpi_p8
-Checking test 004 cpld_mpi_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_decomp_p8
+Checking test 004 cpld_decomp_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -228,6 +225,7 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -263,25 +261,31 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 358.793254
-  0: The maximum resident set size (KB)                   = 1306616
+  0: The total amount of wall time                        = 444.634108
+  0: The maximum resident set size (KB)                   = 1660988
 
-Test 004 cpld_mpi_p8 PASS
+Test 004 cpld_decomp_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_bmark_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_bmark_p8
-Checking test 005 cpld_bmark_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
- Comparing 20130401.060000.out_grd.gwes_30m .........OK
- Comparing 20130401.060000.out_pnt.points .........OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_mpi_p8
+Checking test 005 cpld_mpi_p8 results ....
+ Comparing sfcf024.tile1.nc .........OK
+ Comparing sfcf024.tile2.nc .........OK
+ Comparing sfcf024.tile3.nc .........OK
+ Comparing sfcf024.tile4.nc .........OK
+ Comparing sfcf024.tile5.nc .........OK
+ Comparing sfcf024.tile6.nc .........OK
+ Comparing atmf024.tile1.nc .........OK
+ Comparing atmf024.tile2.nc .........OK
+ Comparing atmf024.tile3.nc .........OK
+ Comparing atmf024.tile4.nc .........OK
+ Comparing atmf024.tile5.nc .........OK
+ Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -315,46 +319,33 @@ Checking test 005 cpld_bmark_p8 results ....
  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
-
-  0: The total amount of wall time                        = 1440.896356
-  0: The maximum resident set size (KB)                   = 2842620
-
-Test 005 cpld_bmark_p8 PASS
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_control_c96_p8
-Checking test 006 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 385.706929
+  0: The maximum resident set size (KB)                   = 1314340
+
+Test 005 cpld_mpi_p8 PASS
+
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_control_c192_p8
+Checking test 006 cpld_control_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -388,31 +379,33 @@ Checking test 006 cpld_control_c96_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-  0: The total amount of wall time                        = 408.761135
-  0: The maximum resident set size (KB)                   = 1433740
-
-Test 006 cpld_control_c96_p8 PASS
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_restart_c96_p8
-Checking test 007 cpld_restart_c96_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
+
+  0: The total amount of wall time                        = 943.906392
+  0: The maximum resident set size (KB)                   = 1666460
+
+Test 006 cpld_control_c192_p8 PASS
+
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_restart_c192_p8
+Checking test 007 cpld_restart_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -446,31 +439,23 @@ Checking test 007 cpld_restart_c96_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 258.226227
-  0: The maximum resident set size (KB)                   = 1398076
-
-Test 007 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_control_c192_p8
-Checking test 008 cpld_control_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+  0: The total amount of wall time                        = 596.304366
+  0: The maximum resident set size (KB)                   = 1632260
+
+Test 007 cpld_restart_c192_p8 PASS
+
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_bmark_p8
+Checking test 008 cpld_bmark_p8 results ....
+ Comparing sfcf006.nc .........OK
+ Comparing atmf006.nc .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -504,31 +489,26 @@ Checking test 008 cpld_control_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-  0: The total amount of wall time                        = 1314.208993
-  0: The maximum resident set size (KB)                   = 1402100
-
-Test 008 cpld_control_c192_p8 PASS
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_restart_c192_p8
-Checking test 009 cpld_restart_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........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
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 1452.709873
+  0: The maximum resident set size (KB)                   = 2453640
+
+Test 008 cpld_bmark_p8 PASS
+
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_restart_bmark_p8
+Checking test 009 cpld_restart_bmark_p8 results ....
+ Comparing sfcf006.nc .........OK
+ Comparing atmf006.nc .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -562,33 +542,36 @@ Checking test 009 cpld_restart_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-  0: The total amount of wall time                        = 905.247358
-  0: The maximum resident set size (KB)                   = 1569344
-
-Test 009 cpld_restart_c192_p8 PASS
-
-Test 010 cpld_control_c384_p8 FAIL
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_debug_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/cpld_debug_p8
-Checking test 012 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........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
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 896.855920
+  0: The maximum resident set size (KB)                   = 2422056
+
+Test 009 cpld_restart_bmark_p8 PASS
+
+
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_debug_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/cpld_debug_p8
+Checking test 010 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -622,18 +605,20 @@ Checking test 012 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1013.438739
-  0: The maximum resident set size (KB)                   = 1492612
+  0: The total amount of wall time                        = 646.536646
+  0: The maximum resident set size (KB)                   = 1645148
 
-Test 012 cpld_debug_p8 PASS
+Test 010 cpld_debug_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control
-Checking test 013 control results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control
+Checking test 011 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -679,15 +664,15 @@ Checking test 013 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 133.732362
-  0: The maximum resident set size (KB)                   = 435300
+  0: The total amount of wall time                        = 135.043355
+  0: The maximum resident set size (KB)                   = 435276
 
-Test 013 control PASS
+Test 011 control PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_decomp
-Checking test 014 control_decomp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_decomp
+Checking test 012 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -729,29 +714,29 @@ Checking test 014 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 138.447551
-  0: The maximum resident set size (KB)                   = 433488
+  0: The total amount of wall time                        = 148.099865
+  0: The maximum resident set size (KB)                   = 433352
 
-Test 014 control_decomp PASS
+Test 012 control_decomp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_2dwrtdecomp
-Checking test 015 control_2dwrtdecomp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_2dwrtdecomp
+Checking test 013 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 127.041195
-  0: The maximum resident set size (KB)                   = 435400
+  0: The total amount of wall time                        = 131.081701
+  0: The maximum resident set size (KB)                   = 435208
 
-Test 015 control_2dwrtdecomp PASS
+Test 013 control_2dwrtdecomp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_2threads
-Checking test 016 control_2threads results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_2threads
+Checking test 014 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -793,15 +778,15 @@ Checking test 016 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 170.301277
- 0: The maximum resident set size (KB)                   = 488208
+ 0: The total amount of wall time                        = 176.507218
+ 0: The maximum resident set size (KB)                   = 490996
 
-Test 016 control_2threads PASS
+Test 014 control_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_restart
-Checking test 017 control_restart results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_restart
+Checking test 015 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -839,15 +824,15 @@ Checking test 017 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 71.886650
-  0: The maximum resident set size (KB)                   = 171872
+  0: The total amount of wall time                        = 73.267125
+  0: The maximum resident set size (KB)                   = 172048
 
-Test 017 control_restart PASS
+Test 015 control_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_fhzero
-Checking test 018 control_fhzero results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_fhzero
+Checking test 016 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -889,15 +874,15 @@ Checking test 018 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 125.207291
-  0: The maximum resident set size (KB)                   = 435340
+  0: The total amount of wall time                        = 127.758764
+  0: The maximum resident set size (KB)                   = 435276
 
-Test 018 control_fhzero PASS
+Test 016 control_fhzero PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_CubedSphereGrid
-Checking test 019 control_CubedSphereGrid results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_CubedSphereGrid
+Checking test 017 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -923,15 +908,15 @@ Checking test 019 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 127.709771
-  0: The maximum resident set size (KB)                   = 435144
+  0: The total amount of wall time                        = 130.878070
+  0: The maximum resident set size (KB)                   = 435100
 
-Test 019 control_CubedSphereGrid PASS
+Test 017 control_CubedSphereGrid PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_latlon
-Checking test 020 control_latlon results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_latlon
+Checking test 018 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -941,15 +926,15 @@ Checking test 020 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 129.975874
-  0: The maximum resident set size (KB)                   = 435276
+  0: The total amount of wall time                        = 132.809593
+  0: The maximum resident set size (KB)                   = 435240
 
-Test 020 control_latlon PASS
+Test 018 control_latlon PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_wrtGauss_netcdf_parallel
-Checking test 021 control_wrtGauss_netcdf_parallel results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_wrtGauss_netcdf_parallel
+Checking test 019 control_wrtGauss_netcdf_parallel results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -959,15 +944,15 @@ Checking test 021 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 136.304833
-  0: The maximum resident set size (KB)                   = 435272
+  0: The total amount of wall time                        = 140.216353
+  0: The maximum resident set size (KB)                   = 435336
 
-Test 021 control_wrtGauss_netcdf_parallel PASS
+Test 019 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_c48
-Checking test 022 control_c48 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_c48
+Checking test 020 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1005,15 +990,15 @@ Checking test 022 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 358.703191
-0: The maximum resident set size (KB)                   = 631240
+0: The total amount of wall time                        = 359.033550
+0: The maximum resident set size (KB)                   = 631160
 
-Test 022 control_c48 PASS
+Test 020 control_c48 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_c192
-Checking test 023 control_c192 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_c192
+Checking test 021 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1023,15 +1008,15 @@ Checking test 023 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 541.981680
-  0: The maximum resident set size (KB)                   = 537460
+  0: The total amount of wall time                        = 550.529936
+  0: The maximum resident set size (KB)                   = 537704
 
-Test 023 control_c192 PASS Tries: 2
+Test 021 control_c192 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_c384
-Checking test 024 control_c384 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_c384
+Checking test 022 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1041,15 +1026,15 @@ Checking test 024 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 772.287415
-  0: The maximum resident set size (KB)                   = 810040
+  0: The total amount of wall time                        = 789.170634
+  0: The maximum resident set size (KB)                   = 809960
 
-Test 024 control_c384 PASS Tries: 2
+Test 022 control_c384 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_c384gdas
-Checking test 025 control_c384gdas results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_c384gdas
+Checking test 023 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1091,15 +1076,15 @@ Checking test 025 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 721.110798
-  0: The maximum resident set size (KB)                   = 930516
+  0: The total amount of wall time                        = 982.758990
+  0: The maximum resident set size (KB)                   = 930716
 
-Test 025 control_c384gdas PASS
+Test 023 control_c384gdas PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_stochy
-Checking test 026 control_stochy results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_stochy
+Checking test 024 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1109,29 +1094,29 @@ Checking test 026 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 87.902490
-  0: The maximum resident set size (KB)                   = 438636
+  0: The total amount of wall time                        = 90.172294
+  0: The maximum resident set size (KB)                   = 438700
 
-Test 026 control_stochy PASS
+Test 024 control_stochy PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_stochy_restart
-Checking test 027 control_stochy_restart results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_stochy_restart
+Checking test 025 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 49.005255
-  0: The maximum resident set size (KB)                   = 189500
+  0: The total amount of wall time                        = 48.531581
+  0: The maximum resident set size (KB)                   = 189472
 
-Test 027 control_stochy_restart PASS
+Test 025 control_stochy_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_lndp
-Checking test 028 control_lndp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_lndp
+Checking test 026 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1141,15 +1126,15 @@ Checking test 028 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 79.031347
-  0: The maximum resident set size (KB)                   = 439292
+  0: The total amount of wall time                        = 204.363962
+  0: The maximum resident set size (KB)                   = 439392
 
-Test 028 control_lndp PASS
+Test 026 control_lndp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_iovr4
-Checking test 029 control_iovr4 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_iovr4
+Checking test 027 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1163,15 +1148,15 @@ Checking test 029 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 132.953094
-  0: The maximum resident set size (KB)                   = 435484
+  0: The total amount of wall time                        = 135.657728
+  0: The maximum resident set size (KB)                   = 435272
 
-Test 029 control_iovr4 PASS
+Test 027 control_iovr4 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_iovr5
-Checking test 030 control_iovr5 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_iovr5
+Checking test 028 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1185,15 +1170,15 @@ Checking test 030 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 134.775246
-  0: The maximum resident set size (KB)                   = 435364
+  0: The total amount of wall time                        = 137.219763
+  0: The maximum resident set size (KB)                   = 435284
 
-Test 030 control_iovr5 PASS
+Test 028 control_iovr5 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_p8
-Checking test 031 control_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_p8
+Checking test 029 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1239,15 +1224,15 @@ Checking test 031 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 173.734358
-  0: The maximum resident set size (KB)                   = 800952
+  0: The total amount of wall time                        = 191.609378
+  0: The maximum resident set size (KB)                   = 800924
 
-Test 031 control_p8 PASS
+Test 029 control_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_p8_lndp
-Checking test 032 control_p8_lndp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_p8_lndp
+Checking test 030 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1265,15 +1250,15 @@ Checking test 032 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-  0: The total amount of wall time                        = 328.522408
-  0: The maximum resident set size (KB)                   = 824812
+  0: The total amount of wall time                        = 350.173227
+  0: The maximum resident set size (KB)                   = 824792
 
-Test 032 control_p8_lndp PASS
+Test 030 control_p8_lndp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_restart_p8
-Checking test 033 control_restart_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_restart_p8
+Checking test 031 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1311,15 +1296,15 @@ Checking test 033 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 109.990648
-  0: The maximum resident set size (KB)                   = 545528
+  0: The total amount of wall time                        = 111.762065
+  0: The maximum resident set size (KB)                   = 545376
 
-Test 033 control_restart_p8 PASS
+Test 031 control_restart_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_decomp_p8
-Checking test 034 control_decomp_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_decomp_p8
+Checking test 032 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1361,15 +1346,15 @@ Checking test 034 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 184.789745
-  0: The maximum resident set size (KB)                   = 794516
+  0: The total amount of wall time                        = 198.552989
+  0: The maximum resident set size (KB)                   = 794524
 
-Test 034 control_decomp_p8 PASS
+Test 032 control_decomp_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_2threads_p8
-Checking test 035 control_2threads_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_2threads_p8
+Checking test 033 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1411,15 +1396,15 @@ Checking test 035 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 223.504572
- 0: The maximum resident set size (KB)                   = 898440
+ 0: The total amount of wall time                        = 452.095071
+ 0: The maximum resident set size (KB)                   = 898364
 
-Test 035 control_2threads_p8 PASS
+Test 033 control_2threads_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_p8_rrtmgp
-Checking test 036 control_p8_rrtmgp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_p8_rrtmgp
+Checking test 034 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1465,15 +1450,15 @@ Checking test 036 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 217.437928
-  0: The maximum resident set size (KB)                   = 915676
+  0: The total amount of wall time                        = 231.791796
+  0: The maximum resident set size (KB)                   = 939684
 
-Test 036 control_p8_rrtmgp PASS
+Test 034 control_p8_rrtmgp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_control
-Checking test 037 regional_control results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_control
+Checking test 035 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1483,58 +1468,58 @@ Checking test 037 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 356.696715
- 0: The maximum resident set size (KB)                   = 544272
+ 0: The total amount of wall time                        = 356.323025
+ 0: The maximum resident set size (KB)                   = 544392
 
-Test 037 regional_control PASS
+Test 035 regional_control PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_restart
-Checking test 038 regional_restart results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_restart
+Checking test 036 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 198.279483
- 0: The maximum resident set size (KB)                   = 541804
+ 0: The total amount of wall time                        = 199.945895
+ 0: The maximum resident set size (KB)                   = 541896
 
-Test 038 regional_restart PASS
+Test 036 regional_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_control_2dwrtdecomp
-Checking test 039 regional_control_2dwrtdecomp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_control_2dwrtdecomp
+Checking test 037 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 353.467135
- 0: The maximum resident set size (KB)                   = 544328
+ 0: The total amount of wall time                        = 355.730187
+ 0: The maximum resident set size (KB)                   = 544252
 
-Test 039 regional_control_2dwrtdecomp PASS
+Test 037 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_noquilt
-Checking test 040 regional_noquilt results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_noquilt
+Checking test 038 regional_noquilt 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                        = 372.930120
- 0: The maximum resident set size (KB)                   = 548448
+ 0: The total amount of wall time                        = 382.001769
+ 0: The maximum resident set size (KB)                   = 548416
 
-Test 040 regional_noquilt PASS
+Test 038 regional_noquilt PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_2threads
-Checking test 041 regional_2threads results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_2threads
+Checking test 039 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1544,29 +1529,29 @@ Checking test 041 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 273.524362
- 0: The maximum resident set size (KB)                   = 544396
+ 0: The total amount of wall time                        = 279.851421
+ 0: The maximum resident set size (KB)                   = 544336
 
-Test 041 regional_2threads PASS
+Test 039 regional_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_netcdf_parallel
-Checking test 042 regional_netcdf_parallel results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_netcdf_parallel
+Checking test 040 regional_netcdf_parallel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 356.803655
- 0: The maximum resident set size (KB)                   = 541980
+ 0: The total amount of wall time                        = 361.001259
+ 0: The maximum resident set size (KB)                   = 541880
 
-Test 042 regional_netcdf_parallel PASS
+Test 040 regional_netcdf_parallel PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_3km
-Checking test 043 regional_3km results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_3km
+Checking test 041 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1576,15 +1561,15 @@ Checking test 043 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 290.687141
-  0: The maximum resident set size (KB)                   = 572804
+  0: The total amount of wall time                        = 291.066676
+  0: The maximum resident set size (KB)                   = 572812
 
-Test 043 regional_3km PASS
+Test 041 regional_3km PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_control
-Checking test 044 rap_control results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_control
+Checking test 042 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1630,15 +1615,15 @@ Checking test 044 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 446.930796
-  0: The maximum resident set size (KB)                   = 804336
+  0: The total amount of wall time                        = 451.993359
+  0: The maximum resident set size (KB)                   = 804288
 
-Test 044 rap_control PASS
+Test 042 rap_control PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_rrtmgp
-Checking test 045 rap_rrtmgp results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_rrtmgp
+Checking test 043 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1684,15 +1669,15 @@ Checking test 045 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 492.027614
-  0: The maximum resident set size (KB)                   = 922276
+  0: The total amount of wall time                        = 492.032006
+  0: The maximum resident set size (KB)                   = 922256
 
-Test 045 rap_rrtmgp PASS
+Test 043 rap_rrtmgp PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_spp_sppt_shum_skeb
-Checking test 046 regional_spp_sppt_shum_skeb results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_spp_sppt_shum_skeb
+Checking test 044 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1702,15 +1687,15 @@ Checking test 046 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 344.387509
-  0: The maximum resident set size (KB)                   = 888496
+  0: The total amount of wall time                        = 363.013411
+  0: The maximum resident set size (KB)                   = 887596
 
-Test 046 regional_spp_sppt_shum_skeb PASS
+Test 044 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_2threads
-Checking test 047 rap_2threads results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_2threads
+Checking test 045 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1756,15 +1741,15 @@ Checking test 047 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 575.225759
- 0: The maximum resident set size (KB)                   = 868636
+ 0: The total amount of wall time                        = 567.028781
+ 0: The maximum resident set size (KB)                   = 868900
 
-Test 047 rap_2threads PASS
+Test 045 rap_2threads PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_restart
-Checking test 048 rap_restart results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_restart
+Checking test 046 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1802,15 +1787,15 @@ Checking test 048 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 229.375034
-  0: The maximum resident set size (KB)                   = 546336
+  0: The total amount of wall time                        = 234.613415
+  0: The maximum resident set size (KB)                   = 546272
 
-Test 048 rap_restart PASS
+Test 046 rap_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_sfcdiff
-Checking test 049 rap_sfcdiff results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_sfcdiff
+Checking test 047 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1856,15 +1841,15 @@ Checking test 049 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 449.080235
-  0: The maximum resident set size (KB)                   = 804176
+  0: The total amount of wall time                        = 449.939134
+  0: The maximum resident set size (KB)                   = 804164
 
-Test 049 rap_sfcdiff PASS
+Test 047 rap_sfcdiff PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_sfcdiff_restart
-Checking test 050 rap_sfcdiff_restart results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_sfcdiff_restart
+Checking test 048 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1902,15 +1887,15 @@ Checking test 050 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 229.547801
-  0: The maximum resident set size (KB)                   = 545996
+  0: The total amount of wall time                        = 235.443195
+  0: The maximum resident set size (KB)                   = 546148
 
-Test 050 rap_sfcdiff_restart PASS
+Test 048 rap_sfcdiff_restart PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hrrr_control
-Checking test 051 hrrr_control results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hrrr_control
+Checking test 049 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1956,15 +1941,15 @@ Checking test 051 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 429.585332
-  0: The maximum resident set size (KB)                   = 801744
+  0: The total amount of wall time                        = 436.121617
+  0: The maximum resident set size (KB)                   = 801828
 
-Test 051 hrrr_control PASS
+Test 049 hrrr_control PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_v1beta
-Checking test 052 rrfs_v1beta results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_v1beta
+Checking test 050 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2010,15 +1995,15 @@ Checking test 052 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 439.608124
-  0: The maximum resident set size (KB)                   = 798836
+  0: The total amount of wall time                        = 449.946458
+  0: The maximum resident set size (KB)                   = 798748
 
-Test 052 rrfs_v1beta PASS
+Test 050 rrfs_v1beta PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_v1nssl
-Checking test 053 rrfs_v1nssl results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_v1nssl
+Checking test 051 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2032,15 +2017,15 @@ Checking test 053 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 531.675164
-  0: The maximum resident set size (KB)                   = 489304
+  0: The total amount of wall time                        = 534.362398
+  0: The maximum resident set size (KB)                   = 489388
 
-Test 053 rrfs_v1nssl PASS
+Test 051 rrfs_v1nssl PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_v1nssl_nohailnoccn
-Checking test 054 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_v1nssl_nohailnoccn
+Checking test 052 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2054,15 +2039,15 @@ Checking test 054 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 520.699179
-  0: The maximum resident set size (KB)                   = 481740
+  0: The total amount of wall time                        = 522.895479
+  0: The maximum resident set size (KB)                   = 481604
 
-Test 054 rrfs_v1nssl_nohailnoccn PASS
+Test 052 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_conus13km_hrrr_warm
-Checking test 055 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_conus13km_hrrr_warm
+Checking test 053 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2070,15 +2055,15 @@ Checking test 055 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 204.216768
-  0: The maximum resident set size (KB)                   = 615988
+  0: The total amount of wall time                        = 205.511393
+  0: The maximum resident set size (KB)                   = 616084
 
-Test 055 rrfs_conus13km_hrrr_warm PASS
+Test 053 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_conus13km_radar_tten_warm
-Checking test 056 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_conus13km_radar_tten_warm
+Checking test 054 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2086,15 +2071,15 @@ Checking test 056 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 204.183081
-  0: The maximum resident set size (KB)                   = 618556
+  0: The total amount of wall time                        = 205.943013
+  0: The maximum resident set size (KB)                   = 618716
 
-Test 056 rrfs_conus13km_radar_tten_warm PASS
+Test 054 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_smoke_conus13km_hrrr_warm
-Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_smoke_conus13km_hrrr_warm
+Checking test 055 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2102,15 +2087,15 @@ Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 225.958083
-  0: The maximum resident set size (KB)                   = 626744
+  0: The total amount of wall time                        = 368.940567
+  0: The maximum resident set size (KB)                   = 626976
 
-Test 057 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 055 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_csawmgt
-Checking test 058 control_csawmgt results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_csawmgt
+Checking test 056 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2120,15 +2105,15 @@ Checking test 058 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 363.893277
-  0: The maximum resident set size (KB)                   = 503144
+  0: The total amount of wall time                        = 524.842702
+  0: The maximum resident set size (KB)                   = 503232
 
-Test 058 control_csawmgt PASS
+Test 056 control_csawmgt PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_flake
-Checking test 059 control_flake results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_flake
+Checking test 057 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2138,15 +2123,15 @@ Checking test 059 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 243.028711
-  0: The maximum resident set size (KB)                   = 507860
+  0: The total amount of wall time                        = 242.445329
+  0: The maximum resident set size (KB)                   = 507852
 
-Test 059 control_flake PASS
+Test 057 control_flake PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_ras
-Checking test 060 control_ras results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_ras
+Checking test 058 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2156,15 +2141,15 @@ Checking test 060 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 184.655037
-  0: The maximum resident set size (KB)                   = 469936
+  0: The total amount of wall time                        = 186.656606
+  0: The maximum resident set size (KB)                   = 470028
 
-Test 060 control_ras PASS
+Test 058 control_ras PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson
-Checking test 061 control_thompson results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson
+Checking test 059 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2174,15 +2159,15 @@ Checking test 061 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 252.032603
-  0: The maximum resident set size (KB)                   = 818832
+  0: The total amount of wall time                        = 257.922688
+  0: The maximum resident set size (KB)                   = 818472
 
-Test 061 control_thompson PASS
+Test 059 control_thompson PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson_no_aero
-Checking test 062 control_thompson_no_aero results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson_no_aero
+Checking test 060 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2192,55 +2177,55 @@ Checking test 062 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 236.935812
-  0: The maximum resident set size (KB)                   = 814160
+  0: The total amount of wall time                        = 239.050400
+  0: The maximum resident set size (KB)                   = 813996
 
-Test 062 control_thompson_no_aero PASS
+Test 060 control_thompson_no_aero PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_wam
-Checking test 063 control_wam results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_wam
+Checking test 061 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 112.970068
-  0: The maximum resident set size (KB)                   = 184116
+  0: The total amount of wall time                        = 116.738875
+  0: The maximum resident set size (KB)                   = 184216
 
-Test 063 control_wam PASS
+Test 061 control_wam PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_debug
-Checking test 064 control_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_debug
+Checking test 062 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 148.291713
-  0: The maximum resident set size (KB)                   = 601068
+  0: The total amount of wall time                        = 153.026337
+  0: The maximum resident set size (KB)                   = 601088
 
-Test 064 control_debug PASS
+Test 062 control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_2threads_debug
-Checking test 065 control_2threads_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_2threads_debug
+Checking test 063 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
- 0: The total amount of wall time                        = 258.523432
- 0: The maximum resident set size (KB)                   = 654224
+ 0: The total amount of wall time                        = 259.387822
+ 0: The maximum resident set size (KB)                   = 654068
 
-Test 065 control_2threads_debug PASS
+Test 063 control_2threads_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_CubedSphereGrid_debug
-Checking test 066 control_CubedSphereGrid_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_CubedSphereGrid_debug
+Checking test 064 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -2266,736 +2251,740 @@ Checking test 066 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 161.842869
-  0: The maximum resident set size (KB)                   = 601296
+  0: The total amount of wall time                        = 162.064534
+  0: The maximum resident set size (KB)                   = 601440
 
-Test 066 control_CubedSphereGrid_debug PASS
+Test 064 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_wrtGauss_netcdf_parallel_debug
-Checking test 067 control_wrtGauss_netcdf_parallel_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_wrtGauss_netcdf_parallel_debug
+Checking test 065 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 158.509046
-  0: The maximum resident set size (KB)                   = 601108
+  0: The total amount of wall time                        = 157.504555
+  0: The maximum resident set size (KB)                   = 601312
 
-Test 067 control_wrtGauss_netcdf_parallel_debug PASS
+Test 065 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_stochy_debug
-Checking test 068 control_stochy_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_stochy_debug
+Checking test 066 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 170.311684
-  0: The maximum resident set size (KB)                   = 605640
+  0: The total amount of wall time                        = 174.273258
+  0: The maximum resident set size (KB)                   = 605460
 
-Test 068 control_stochy_debug PASS
+Test 066 control_stochy_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_lndp_debug
-Checking test 069 control_lndp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_lndp_debug
+Checking test 067 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 152.372772
-  0: The maximum resident set size (KB)                   = 603336
+  0: The total amount of wall time                        = 155.924274
+  0: The maximum resident set size (KB)                   = 603928
 
-Test 069 control_lndp_debug PASS
+Test 067 control_lndp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_csawmg_debug
-Checking test 070 control_csawmg_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_csawmg_debug
+Checking test 068 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 265.598968
-  0: The maximum resident set size (KB)                   = 640896
+  0: The total amount of wall time                        = 254.587593
+  0: The maximum resident set size (KB)                   = 640760
 
-Test 070 control_csawmg_debug PASS
+Test 068 control_csawmg_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_csawmgt_debug
-Checking test 071 control_csawmgt_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_csawmgt_debug
+Checking test 069 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 246.823813
-  0: The maximum resident set size (KB)                   = 640860
+  0: The total amount of wall time                        = 249.259805
+  0: The maximum resident set size (KB)                   = 640796
 
-Test 071 control_csawmgt_debug PASS
+Test 069 control_csawmgt_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_ras_debug
-Checking test 072 control_ras_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_ras_debug
+Checking test 070 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 155.851696
-  0: The maximum resident set size (KB)                   = 613932
+  0: The total amount of wall time                        = 158.690682
+  0: The maximum resident set size (KB)                   = 613872
 
-Test 072 control_ras_debug PASS
+Test 070 control_ras_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_diag_debug
-Checking test 073 control_diag_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_diag_debug
+Checking test 071 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 159.279643
-  0: The maximum resident set size (KB)                   = 655956
+  0: The total amount of wall time                        = 160.545585
+  0: The maximum resident set size (KB)                   = 655836
 
-Test 073 control_diag_debug PASS
+Test 071 control_diag_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_debug_p8
-Checking test 074 control_debug_p8 results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_debug_p8
+Checking test 072 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 178.877587
-  0: The maximum resident set size (KB)                   = 946284
+  0: The total amount of wall time                        = 181.743345
+  0: The maximum resident set size (KB)                   = 988492
 
-Test 074 control_debug_p8 PASS
+Test 072 control_debug_p8 PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson_debug
-Checking test 075 control_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson_debug
+Checking test 073 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 181.843176
-  0: The maximum resident set size (KB)                   = 959192
+  0: The total amount of wall time                        = 180.669217
+  0: The maximum resident set size (KB)                   = 959512
 
-Test 075 control_thompson_debug PASS
+Test 073 control_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson_no_aero_debug
-Checking test 076 control_thompson_no_aero_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson_no_aero_debug
+Checking test 074 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 170.595399
-  0: The maximum resident set size (KB)                   = 955640
+  0: The total amount of wall time                        = 175.358772
+  0: The maximum resident set size (KB)                   = 955392
 
-Test 076 control_thompson_no_aero_debug PASS
+Test 074 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson_extdiag_debug
-Checking test 077 control_thompson_extdiag_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson_extdiag_debug
+Checking test 075 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 189.607151
-  0: The maximum resident set size (KB)                   = 988744
+  0: The total amount of wall time                        = 192.129339
+  0: The maximum resident set size (KB)                   = 988532
 
-Test 077 control_thompson_extdiag_debug PASS
+Test 075 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_thompson_progcld_thompson_debug
-Checking test 078 control_thompson_progcld_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_thompson_progcld_thompson_debug
+Checking test 076 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 179.850142
-  0: The maximum resident set size (KB)                   = 959268
+  0: The total amount of wall time                        = 183.150652
+  0: The maximum resident set size (KB)                   = 959092
 
-Test 078 control_thompson_progcld_thompson_debug PASS
+Test 076 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/regional_debug
-Checking test 079 regional_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/regional_debug
+Checking test 077 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
- 0: The total amount of wall time                        = 255.683076
- 0: The maximum resident set size (KB)                   = 569128
+ 0: The total amount of wall time                        = 258.391470
+ 0: The maximum resident set size (KB)                   = 569136
 
-Test 079 regional_debug PASS
+Test 077 regional_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_control_debug
-Checking test 080 rap_control_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_control_debug
+Checking test 078 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 282.628084
-  0: The maximum resident set size (KB)                   = 967496
+  0: The total amount of wall time                        = 281.122966
+  0: The maximum resident set size (KB)                   = 967076
 
-Test 080 rap_control_debug PASS
+Test 078 rap_control_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_unified_drag_suite_debug
-Checking test 081 rap_unified_drag_suite_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_unified_drag_suite_debug
+Checking test 079 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 282.607768
-  0: The maximum resident set size (KB)                   = 967112
+  0: The total amount of wall time                        = 287.809585
+  0: The maximum resident set size (KB)                   = 967124
 
-Test 081 rap_unified_drag_suite_debug PASS
+Test 079 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_diag_debug
-Checking test 082 rap_diag_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_diag_debug
+Checking test 080 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 298.069868
-  0: The maximum resident set size (KB)                   = 1050684
+  0: The total amount of wall time                        = 298.238252
+  0: The maximum resident set size (KB)                   = 1050704
 
-Test 082 rap_diag_debug PASS
+Test 080 rap_diag_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_cires_ugwp_debug
-Checking test 083 rap_cires_ugwp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_cires_ugwp_debug
+Checking test 081 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 284.738750
-  0: The maximum resident set size (KB)                   = 966204
+  0: The total amount of wall time                        = 287.310105
+  0: The maximum resident set size (KB)                   = 965704
 
-Test 083 rap_cires_ugwp_debug PASS
+Test 081 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_unified_ugwp_debug
-Checking test 084 rap_unified_ugwp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_unified_ugwp_debug
+Checking test 082 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 286.989601
-  0: The maximum resident set size (KB)                   = 967220
+  0: The total amount of wall time                        = 288.320408
+  0: The maximum resident set size (KB)                   = 967092
 
-Test 084 rap_unified_ugwp_debug PASS
+Test 082 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_lndp_debug
-Checking test 085 rap_lndp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_lndp_debug
+Checking test 083 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 282.531688
-  0: The maximum resident set size (KB)                   = 968052
+  0: The total amount of wall time                        = 285.620403
+  0: The maximum resident set size (KB)                   = 967932
 
-Test 085 rap_lndp_debug PASS
+Test 083 rap_lndp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_flake_debug
-Checking test 086 rap_flake_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_flake_debug
+Checking test 084 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 282.270281
-  0: The maximum resident set size (KB)                   = 967256
+  0: The total amount of wall time                        = 279.746337
+  0: The maximum resident set size (KB)                   = 967172
 
-Test 086 rap_flake_debug PASS
+Test 084 rap_flake_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_progcld_thompson_debug
-Checking test 087 rap_progcld_thompson_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_progcld_thompson_debug
+Checking test 085 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 302.811127
-  0: The maximum resident set size (KB)                   = 967240
+  0: The total amount of wall time                        = 284.434874
+  0: The maximum resident set size (KB)                   = 967208
 
-Test 087 rap_progcld_thompson_debug PASS
+Test 085 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_noah_debug
-Checking test 088 rap_noah_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_noah_debug
+Checking test 086 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 280.365030
-  0: The maximum resident set size (KB)                   = 967036
+  0: The total amount of wall time                        = 278.683924
+  0: The maximum resident set size (KB)                   = 966804
 
-Test 088 rap_noah_debug PASS
+Test 086 rap_noah_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_rrtmgp_debug
-Checking test 089 rap_rrtmgp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_rrtmgp_debug
+Checking test 087 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 475.472273
-  0: The maximum resident set size (KB)                   = 1087992
+  0: The total amount of wall time                        = 477.024295
+  0: The maximum resident set size (KB)                   = 1087948
 
-Test 089 rap_rrtmgp_debug PASS
+Test 087 rap_rrtmgp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_sfcdiff_debug
-Checking test 090 rap_sfcdiff_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_sfcdiff_debug
+Checking test 088 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 279.954305
-  0: The maximum resident set size (KB)                   = 966920
+  0: The total amount of wall time                        = 286.311506
+  0: The maximum resident set size (KB)                   = 967004
 
-Test 090 rap_sfcdiff_debug PASS
+Test 088 rap_sfcdiff_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 091 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 089 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 467.008100
-  0: The maximum resident set size (KB)                   = 965364
+  0: The total amount of wall time                        = 482.287014
+  0: The maximum resident set size (KB)                   = 965480
 
-Test 091 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 089 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/rrfs_v1beta_debug
-Checking test 092 rrfs_v1beta_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/rrfs_v1beta_debug
+Checking test 090 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 279.409278
-  0: The maximum resident set size (KB)                   = 964580
+  0: The total amount of wall time                        = 278.987934
+  0: The maximum resident set size (KB)                   = 964624
 
-Test 092 rrfs_v1beta_debug PASS
+Test 090 rrfs_v1beta_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_wam_debug
-Checking test 093 control_wam_debug results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_wam_debug
+Checking test 091 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 293.017349
-  0: The maximum resident set size (KB)                   = 214384
+  0: The total amount of wall time                        = 312.654884
+  0: The maximum resident set size (KB)                   = 214392
 
-Test 093 control_wam_debug PASS
+Test 091 control_wam_debug PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_atm
-Checking test 094 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_atm
+Checking test 092 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 358.288770
-  0: The maximum resident set size (KB)                   = 660304
+  0: The total amount of wall time                        = 447.229382
+  0: The maximum resident set size (KB)                   = 659996
 
-Test 094 hafs_regional_atm PASS
+Test 092 hafs_regional_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_atm_thompson_gfdlsf
-Checking test 095 hafs_regional_atm_thompson_gfdlsf results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_atm_thompson_gfdlsf
+Checking test 093 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-  0: The total amount of wall time                        = 405.547410
-  0: The maximum resident set size (KB)                   = 1025736
+  0: The total amount of wall time                        = 501.239996
+  0: The maximum resident set size (KB)                   = 1025676
 
-Test 095 hafs_regional_atm_thompson_gfdlsf PASS
+Test 093 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_atm_ocn
-Checking test 096 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_atm_ocn
+Checking test 094 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 449.891817
-  0: The maximum resident set size (KB)                   = 690868
+  0: The total amount of wall time                        = 464.305922
+  0: The maximum resident set size (KB)                   = 690412
 
-Test 096 hafs_regional_atm_ocn PASS
+Test 094 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_atm_wav
-Checking test 097 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_atm_wav
+Checking test 095 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 910.743833
-  0: The maximum resident set size (KB)                   = 682556
+  0: The total amount of wall time                        = 929.919367
+  0: The maximum resident set size (KB)                   = 723052
 
-Test 097 hafs_regional_atm_wav PASS
+Test 095 hafs_regional_atm_wav PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_atm_ocn_wav
-Checking test 098 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_atm_ocn_wav
+Checking test 096 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 1023.593113
-  0: The maximum resident set size (KB)                   = 700488
+  0: The total amount of wall time                        = 1129.355800
+  0: The maximum resident set size (KB)                   = 735712
 
-Test 098 hafs_regional_atm_ocn_wav PASS
+Test 096 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_1nest_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_1nest_atm
-Checking test 099 hafs_regional_1nest_atm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_1nest_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_1nest_atm
+Checking test 097 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 559.170751
-  0: The maximum resident set size (KB)                   = 259368
+  0: The total amount of wall time                        = 696.275055
+  0: The maximum resident set size (KB)                   = 264164
 
-Test 099 hafs_regional_1nest_atm PASS
+Test 097 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_telescopic_2nests_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_telescopic_2nests_atm
-Checking test 100 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_telescopic_2nests_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_telescopic_2nests_atm
+Checking test 098 hafs_regional_telescopic_2nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-  0: The total amount of wall time                        = 601.659769
-  0: The maximum resident set size (KB)                   = 264776
+  0: The total amount of wall time                        = 741.158049
+  0: The maximum resident set size (KB)                   = 267204
 
-Test 100 hafs_regional_telescopic_2nests_atm PASS
+Test 098 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_1nest_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_global_1nest_atm
-Checking test 101 hafs_global_1nest_atm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_1nest_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_global_1nest_atm
+Checking test 099 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 263.472300
-  0: The maximum resident set size (KB)                   = 165552
+  0: The total amount of wall time                        = 411.036832
+  0: The maximum resident set size (KB)                   = 165328
 
-Test 101 hafs_global_1nest_atm PASS
+Test 099 hafs_global_1nest_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_multiple_4nests_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_global_multiple_4nests_atm
-Checking test 102 hafs_global_multiple_4nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_multiple_4nests_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_global_multiple_4nests_atm
+Checking test 100 hafs_global_multiple_4nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing atm.nest05.f006.nc .........OK
- Comparing sfc.nest05.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest05.f006.nc .........OK
 
-  0: The total amount of wall time                        = 707.486098
-  0: The maximum resident set size (KB)                   = 232940
+  0: The total amount of wall time                        = 790.264859
+  0: The maximum resident set size (KB)                   = 218568
 
-Test 102 hafs_global_multiple_4nests_atm PASS
+Test 100 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_specified_moving_1nest_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_specified_moving_1nest_atm
-Checking test 103 hafs_regional_specified_moving_1nest_atm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_specified_moving_1nest_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_specified_moving_1nest_atm
+Checking test 101 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 328.166209
-  0: The maximum resident set size (KB)                   = 266884
+  0: The total amount of wall time                        = 335.149831
+  0: The maximum resident set size (KB)                   = 273652
 
-Test 103 hafs_regional_specified_moving_1nest_atm PASS
+Test 101 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_storm_following_1nest_atm
-Checking test 104 hafs_regional_storm_following_1nest_atm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_storm_following_1nest_atm
+Checking test 102 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 315.804757
-  0: The maximum resident set size (KB)                   = 272360
+  0: The total amount of wall time                        = 337.432992
+  0: The maximum resident set size (KB)                   = 271744
 
-Test 104 hafs_regional_storm_following_1nest_atm PASS
+Test 102 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_storm_following_1nest_atm_ocn
-Checking test 105 hafs_regional_storm_following_1nest_atm_ocn results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_storm_following_1nest_atm_ocn
+Checking test 103 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-  0: The total amount of wall time                        = 331.454335
-  0: The maximum resident set size (KB)                   = 296736
+  0: The total amount of wall time                        = 337.742115
+  0: The maximum resident set size (KB)                   = 296920
 
-Test 105 hafs_regional_storm_following_1nest_atm_ocn PASS
+Test 103 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_storm_following_1nest_atm_ocn_wav
-Checking test 106 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_storm_following_1nest_atm_ocn_wav
+Checking test 104 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 859.069786
-  0: The maximum resident set size (KB)                   = 314680
+  0: The total amount of wall time                        = 874.664149
+  0: The maximum resident set size (KB)                   = 359416
 
-Test 106 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
+Test 104 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_storm_following_1nest_atm
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_global_storm_following_1nest_atm
-Checking test 107 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_storm_following_1nest_atm
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_global_storm_following_1nest_atm
+Checking test 105 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 93.716963
-  0: The maximum resident set size (KB)                   = 185120
+  0: The total amount of wall time                        = 95.531801
+  0: The maximum resident set size (KB)                   = 185388
 
-Test 107 hafs_global_storm_following_1nest_atm PASS
+Test 105 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_docn
-Checking test 108 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_docn
+Checking test 106 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 417.075104
-  0: The maximum resident set size (KB)                   = 696376
+  0: The total amount of wall time                        = 455.675221
+  0: The maximum resident set size (KB)                   = 697316
 
-Test 108 hafs_regional_docn PASS
+Test 106 hafs_regional_docn PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_docn_oisst
-Checking test 109 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_docn_oisst
+Checking test 107 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 422.070861
-  0: The maximum resident set size (KB)                   = 684772
+  0: The total amount of wall time                        = 430.259312
+  0: The maximum resident set size (KB)                   = 683752
 
-Test 109 hafs_regional_docn_oisst PASS
+Test 107 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/hafs_regional_datm_cdeps
-Checking test 110 hafs_regional_datm_cdeps results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/hafs_regional_datm_cdeps
+Checking test 108 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1038.077695
-  0: The maximum resident set size (KB)                   = 806688
+  0: The total amount of wall time                        = 1146.506545
+  0: The maximum resident set size (KB)                   = 806736
 
-Test 110 hafs_regional_datm_cdeps PASS
+Test 108 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_control_cfsr
-Checking test 111 datm_cdeps_control_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_control_cfsr
+Checking test 109 datm_cdeps_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                        = 151.966871
- 0: The maximum resident set size (KB)                   = 687072
+ 0: The total amount of wall time                        = 149.706197
+ 0: The maximum resident set size (KB)                   = 687000
 
-Test 111 datm_cdeps_control_cfsr PASS
+Test 109 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_restart_cfsr
-Checking test 112 datm_cdeps_restart_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_restart_cfsr
+Checking test 110 datm_cdeps_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                        = 84.939209
- 0: The maximum resident set size (KB)                   = 686888
+ 0: The total amount of wall time                        = 244.379133
+ 0: The maximum resident set size (KB)                   = 686956
 
-Test 112 datm_cdeps_restart_cfsr PASS
+Test 110 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_gefs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_control_gefs
-Checking test 113 datm_cdeps_control_gefs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_gefs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_control_gefs
+Checking test 111 datm_cdeps_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                        = 148.068050
- 0: The maximum resident set size (KB)                   = 567072
+ 0: The total amount of wall time                        = 235.687694
+ 0: The maximum resident set size (KB)                   = 570988
 
-Test 113 datm_cdeps_control_gefs PASS
+Test 111 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_iau_gefs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_iau_gefs
-Checking test 114 datm_cdeps_iau_gefs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_iau_gefs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_iau_gefs
+Checking test 112 datm_cdeps_iau_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                        = 147.628701
- 0: The maximum resident set size (KB)                   = 566908
+ 0: The total amount of wall time                        = 224.188703
+ 0: The maximum resident set size (KB)                   = 568952
 
-Test 114 datm_cdeps_iau_gefs PASS
+Test 112 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_stochy_gefs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_stochy_gefs
-Checking test 115 datm_cdeps_stochy_gefs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_stochy_gefs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_stochy_gefs
+Checking test 113 datm_cdeps_stochy_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                        = 146.722212
- 0: The maximum resident set size (KB)                   = 568852
+ 0: The total amount of wall time                        = 275.192644
+ 0: The maximum resident set size (KB)                   = 567004
 
-Test 115 datm_cdeps_stochy_gefs PASS
+Test 113 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_bulk_cfsr
-Checking test 116 datm_cdeps_bulk_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_bulk_cfsr
+Checking test 114 datm_cdeps_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                        = 152.421180
- 0: The maximum resident set size (KB)                   = 687136
+ 0: The total amount of wall time                        = 181.698365
+ 0: The maximum resident set size (KB)                   = 687048
 
-Test 116 datm_cdeps_bulk_cfsr PASS
+Test 114 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_gefs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_bulk_gefs
-Checking test 117 datm_cdeps_bulk_gefs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_gefs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_bulk_gefs
+Checking test 115 datm_cdeps_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                        = 143.778140
- 0: The maximum resident set size (KB)                   = 566840
+ 0: The total amount of wall time                        = 148.926731
+ 0: The maximum resident set size (KB)                   = 570984
 
-Test 117 datm_cdeps_bulk_gefs PASS
+Test 115 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_mx025_cfsr
-Checking test 118 datm_cdeps_mx025_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_mx025_cfsr
+Checking test 116 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3003,15 +2992,15 @@ Checking test 118 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 348.078657
-  0: The maximum resident set size (KB)                   = 486984
+  0: The total amount of wall time                        = 358.543157
+  0: The maximum resident set size (KB)                   = 482080
 
-Test 118 datm_cdeps_mx025_cfsr PASS
+Test 116 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_gefs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_mx025_gefs
-Checking test 119 datm_cdeps_mx025_gefs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_gefs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_mx025_gefs
+Checking test 117 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3019,65 +3008,65 @@ Checking test 119 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 343.694139
-  0: The maximum resident set size (KB)                   = 450712
+  0: The total amount of wall time                        = 387.710982
+  0: The maximum resident set size (KB)                   = 451640
 
-Test 119 datm_cdeps_mx025_gefs PASS
+Test 117 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_multiple_files_cfsr
-Checking test 120 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_multiple_files_cfsr
+Checking test 118 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 148.274824
- 0: The maximum resident set size (KB)                   = 692508
+ 0: The total amount of wall time                        = 304.842683
+ 0: The maximum resident set size (KB)                   = 679392
 
-Test 120 datm_cdeps_multiple_files_cfsr PASS
+Test 118 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_3072x1536_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_3072x1536_cfsr
-Checking test 121 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_3072x1536_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_3072x1536_cfsr
+Checking test 119 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 200.668826
- 0: The maximum resident set size (KB)                   = 1842876
+ 0: The total amount of wall time                        = 204.981257
+ 0: The maximum resident set size (KB)                   = 1842980
 
-Test 121 datm_cdeps_3072x1536_cfsr PASS
+Test 119 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_gfs
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_gfs
-Checking test 122 datm_cdeps_gfs results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_gfs
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_gfs
+Checking test 120 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 206.091229
- 0: The maximum resident set size (KB)                   = 1842916
+ 0: The total amount of wall time                        = 214.202943
+ 0: The maximum resident set size (KB)                   = 1842872
 
-Test 122 datm_cdeps_gfs PASS
+Test 120 datm_cdeps_gfs PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_debug_cfsr
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/datm_cdeps_debug_cfsr
-Checking test 123 datm_cdeps_debug_cfsr results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_debug_cfsr
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/datm_cdeps_debug_cfsr
+Checking test 121 datm_cdeps_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                        = 362.395556
- 0: The maximum resident set size (KB)                   = 692272
+ 0: The total amount of wall time                        = 367.181120
+ 0: The maximum resident set size (KB)                   = 692340
 
-Test 123 datm_cdeps_debug_cfsr PASS
+Test 121 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atmwav
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_atmwav
-Checking test 124 control_atmwav results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atmwav
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_atmwav
+Checking test 122 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3120,15 +3109,15 @@ Checking test 124 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 87.363519
-  0: The maximum resident set size (KB)                   = 446780
+  0: The total amount of wall time                        = 90.655005
+  0: The maximum resident set size (KB)                   = 446824
 
-Test 124 control_atmwav PASS
+Test 122 control_atmwav PASS
 
 
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atm_aerosols
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_2140/control_atm_aerosols
-Checking test 125 control_atm_aerosols results ....
+baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atm_aerosols
+working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_33517/control_atm_aerosols
+Checking test 123 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3171,124 +3160,12 @@ Checking test 125 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 371.267349
-  0: The maximum resident set size (KB)                   = 1038008
-
-Test 125 control_atm_aerosols PASS
-
-FAILED TESTS: 
-Test cpld_control_c384_p8 010 failed in run_test failed 
-
-REGRESSION TEST FAILED
-Fri May 27 22:44:25 EDT 2022
-Elapsed time: 06h:27m:12s. Have a nice day!
-Sat May 28 21:44:51 EDT 2022
-Start Regression test
-
-Compile 001 elapsed time 732 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_16797/cpld_control_c384_p8
-Checking test 001 cpld_control_c384_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........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.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-  0: The total amount of wall time                        = 1545.578279
-  0: The maximum resident set size (KB)                   = 2852580
-
-Test 001 cpld_control_c384_p8 PASS
-
-
-baseline dir = /lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_16797/cpld_restart_c384_p8
-Checking test 002 cpld_restart_c384_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........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.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-  0: The total amount of wall time                        = 965.555821
-  0: The maximum resident set size (KB)                   = 2850528
+  0: The total amount of wall time                        = 378.356240
+  0: The maximum resident set size (KB)                   = 1039988
 
-Test 002 cpld_restart_c384_p8 PASS
+Test 123 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Sat May 28 22:55:54 EDT 2022
-Elapsed time: 01h:11m:04s. Have a nice day!
+Mon May 30 16:18:41 EDT 2022
+Elapsed time: 07h:19m:42s. Have a nice day!
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
index 0549999804..2b2e508631 100644
--- a/tests/RegressionTests_hera.gnu.log
+++ b/tests/RegressionTests_hera.gnu.log
@@ -1,16 +1,16 @@
-Fri May 27 13:33:02 UTC 2022
+Sun May 29 21:13:50 UTC 2022
 Start Regression test
 
-Compile 001 elapsed time 187 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v17_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 002 elapsed time 203 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 003 elapsed time 301 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 004 elapsed time 106 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 005 elapsed time 228 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 006 elapsed time 128 seconds. -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 007 elapsed time 121 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 001 elapsed time 189 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_thompson,FV3_GFS_v16_ras,FV3_GFS_v17_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 002 elapsed time 191 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 003 elapsed time 287 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 004 elapsed time 95 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 005 elapsed time 234 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 006 elapsed time 123 seconds. -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 007 elapsed time 107 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control
 Checking test 001 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -57,14 +57,14 @@ Checking test 001 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 793.303743
-  0: The maximum resident set size (KB)                   = 483016
+  0: The total amount of wall time                        = 808.592691
+  0: The maximum resident set size (KB)                   = 475360
 
 Test 001 control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_restart
 Checking test 002 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -103,14 +103,14 @@ Checking test 002 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 399.480336
-  0: The maximum resident set size (KB)                   = 187780
+  0: The total amount of wall time                        = 399.603156
+  0: The maximum resident set size (KB)                   = 184856
 
 Test 002 control_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_c48
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_c48
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_c48
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_c48
 Checking test 003 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -149,14 +149,14 @@ Checking test 003 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 673.982521
-0: The maximum resident set size (KB)                   = 700756
+0: The total amount of wall time                        = 673.433339
+0: The maximum resident set size (KB)                   = 694868
 
 Test 003 control_c48 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_stochy
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_stochy
 Checking test 004 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -167,14 +167,14 @@ Checking test 004 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 623.152383
-  0: The maximum resident set size (KB)                   = 483140
+  0: The total amount of wall time                        = 621.625139
+  0: The maximum resident set size (KB)                   = 480072
 
 Test 004 control_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_flake
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_flake
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_flake
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_flake
 Checking test 005 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -185,14 +185,14 @@ Checking test 005 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 1375.952481
-  0: The maximum resident set size (KB)                   = 530100
+  0: The total amount of wall time                        = 1364.722295
+  0: The maximum resident set size (KB)                   = 530084
 
 Test 005 control_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson
 Checking test 006 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -203,14 +203,14 @@ Checking test 006 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 1021.132890
-  0: The maximum resident set size (KB)                   = 844452
+  0: The total amount of wall time                        = 986.864270
+  0: The maximum resident set size (KB)                   = 843416
 
 Test 006 control_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_no_aero
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson_no_aero
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson_no_aero
 Checking test 007 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -221,14 +221,14 @@ Checking test 007 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 964.309454
-  0: The maximum resident set size (KB)                   = 835432
+  0: The total amount of wall time                        = 947.376120
+  0: The maximum resident set size (KB)                   = 836396
 
 Test 007 control_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_ras
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_ras
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_ras
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_ras
 Checking test 008 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -239,14 +239,14 @@ Checking test 008 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 809.802989
-  0: The maximum resident set size (KB)                   = 486576
+  0: The total amount of wall time                        = 786.789824
+  0: The maximum resident set size (KB)                   = 493724
 
 Test 008 control_ras PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_p8
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_p8
 Checking test 009 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -293,14 +293,14 @@ Checking test 009 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 886.519971
-  0: The maximum resident set size (KB)                   = 838968
+  0: The total amount of wall time                        = 865.264599
+  0: The maximum resident set size (KB)                   = 838008
 
 Test 009 control_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_control
 Checking test 010 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -347,14 +347,14 @@ Checking test 010 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1399.523247
-  0: The maximum resident set size (KB)                   = 836428
+  0: The total amount of wall time                        = 1374.272653
+  0: The maximum resident set size (KB)                   = 831800
 
 Test 010 rap_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_2threads
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_2threads
 Checking test 011 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -401,14 +401,14 @@ Checking test 011 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 1399.984897
- 0: The maximum resident set size (KB)                   = 895472
+ 0: The total amount of wall time                        = 1407.363621
+ 0: The maximum resident set size (KB)                   = 898420
 
 Test 011 rap_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_restart
 Checking test 012 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -447,14 +447,14 @@ Checking test 012 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 682.731848
-  0: The maximum resident set size (KB)                   = 546288
+  0: The total amount of wall time                        = 690.812836
+  0: The maximum resident set size (KB)                   = 546116
 
 Test 012 rap_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_sfcdiff
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_sfcdiff
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_sfcdiff
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_sfcdiff
 Checking test 013 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -501,14 +501,14 @@ Checking test 013 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1400.999169
-  0: The maximum resident set size (KB)                   = 832028
+  0: The total amount of wall time                        = 1347.988440
+  0: The maximum resident set size (KB)                   = 832016
 
 Test 013 rap_sfcdiff PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_sfcdiff
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_sfcdiff_restart
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_sfcdiff
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_sfcdiff_restart
 Checking test 014 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -547,14 +547,14 @@ Checking test 014 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 673.643435
-  0: The maximum resident set size (KB)                   = 541256
+  0: The total amount of wall time                        = 673.034021
+  0: The maximum resident set size (KB)                   = 545460
 
 Test 014 rap_sfcdiff_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/hrrr_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/hrrr_control
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/hrrr_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/hrrr_control
 Checking test 015 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -601,14 +601,14 @@ Checking test 015 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1387.756873
-  0: The maximum resident set size (KB)                   = 833248
+  0: The total amount of wall time                        = 1361.802070
+  0: The maximum resident set size (KB)                   = 831840
 
 Test 015 hrrr_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_v1beta
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rrfs_v1beta
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rrfs_v1beta
 Checking test 016 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -655,14 +655,14 @@ Checking test 016 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1433.706211
-  0: The maximum resident set size (KB)                   = 831168
+  0: The total amount of wall time                        = 1386.911423
+  0: The maximum resident set size (KB)                   = 831616
 
 Test 016 rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_conus13km_hrrr_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rrfs_conus13km_hrrr_warm
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_conus13km_hrrr_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rrfs_conus13km_hrrr_warm
 Checking test 017 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -671,14 +671,14 @@ Checking test 017 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 1569.520555
-  0: The maximum resident set size (KB)                   = 639008
+  0: The total amount of wall time                        = 1534.551033
+  0: The maximum resident set size (KB)                   = 640784
 
 Test 017 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_conus13km_radar_tten_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rrfs_conus13km_radar_tten_warm
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_conus13km_radar_tten_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rrfs_conus13km_radar_tten_warm
 Checking test 018 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -687,14 +687,14 @@ Checking test 018 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 1531.279948
-  0: The maximum resident set size (KB)                   = 640492
+  0: The total amount of wall time                        = 1506.914661
+  0: The maximum resident set size (KB)                   = 642740
 
 Test 018 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rrfs_smoke_conus13km_hrrr_warm
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rrfs_smoke_conus13km_hrrr_warm
 Checking test 019 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -703,237 +703,237 @@ Checking test 019 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 1528.577769
-  0: The maximum resident set size (KB)                   = 653632
+  0: The total amount of wall time                        = 1508.777605
+  0: The maximum resident set size (KB)                   = 653616
 
 Test 019 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_debug
 Checking test 020 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 100.281079
-  0: The maximum resident set size (KB)                   = 479192
+  0: The total amount of wall time                        = 97.329043
+  0: The maximum resident set size (KB)                   = 473612
 
 Test 020 control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_diag_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_diag_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_diag_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_diag_debug
 Checking test 021 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 121.513072
-  0: The maximum resident set size (KB)                   = 536000
+  0: The total amount of wall time                        = 121.836708
+  0: The maximum resident set size (KB)                   = 535576
 
 Test 021 control_diag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/fv3_regional_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/regional_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/fv3_regional_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/regional_debug
 Checking test 022 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
- 0: The total amount of wall time                        = 124.271532
- 0: The maximum resident set size (KB)                   = 551064
+ 0: The total amount of wall time                        = 125.495968
+ 0: The maximum resident set size (KB)                   = 552764
 
-Test 022 regional_debug PASS Tries: 2
+Test 022 regional_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_control_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_control_debug
 Checking test 023 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 170.609411
-  0: The maximum resident set size (KB)                   = 846948
+  0: The total amount of wall time                        = 164.669261
+  0: The maximum resident set size (KB)                   = 849288
 
 Test 023 rap_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_diag_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_diag_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_diag_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_diag_debug
 Checking test 024 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 203.224475
-  0: The maximum resident set size (KB)                   = 931136
+  0: The total amount of wall time                        = 202.371298
+  0: The maximum resident set size (KB)                   = 929656
 
 Test 024 rap_diag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_noah_sfcdiff_cires_ugwp_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_noah_sfcdiff_cires_ugwp_debug
 Checking test 025 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 262.744967
-  0: The maximum resident set size (KB)                   = 849304
+  0: The total amount of wall time                        = 264.844110
+  0: The maximum resident set size (KB)                   = 848472
 
 Test 025 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rap_progcld_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rap_progcld_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rap_progcld_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rap_progcld_thompson_debug
 Checking test 026 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 165.533477
-  0: The maximum resident set size (KB)                   = 845796
+  0: The total amount of wall time                        = 167.732864
+  0: The maximum resident set size (KB)                   = 845052
 
 Test 026 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/rrfs_v1beta_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/rrfs_v1beta_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/rrfs_v1beta_debug
 Checking test 027 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 166.925540
-  0: The maximum resident set size (KB)                   = 842148
+  0: The total amount of wall time                        = 165.904612
+  0: The maximum resident set size (KB)                   = 843724
 
 Test 027 rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson_debug
 Checking test 028 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 114.159595
-  0: The maximum resident set size (KB)                   = 842580
+  0: The total amount of wall time                        = 113.221326
+  0: The maximum resident set size (KB)                   = 837704
 
 Test 028 control_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_no_aero_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson_no_aero_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson_no_aero_debug
 Checking test 029 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 108.950594
-  0: The maximum resident set size (KB)                   = 833428
+  0: The total amount of wall time                        = 110.295089
+  0: The maximum resident set size (KB)                   = 833012
 
 Test 029 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_debug_extdiag
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson_extdiag_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_debug_extdiag
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson_extdiag_debug
 Checking test 030 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 130.249169
-  0: The maximum resident set size (KB)                   = 869180
+  0: The total amount of wall time                        = 131.157742
+  0: The maximum resident set size (KB)                   = 870312
 
 Test 030 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_thompson_progcld_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_thompson_progcld_thompson_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_thompson_progcld_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_thompson_progcld_thompson_debug
 Checking test 031 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 110.871174
-  0: The maximum resident set size (KB)                   = 838004
+  0: The total amount of wall time                        = 113.701589
+  0: The maximum resident set size (KB)                   = 839752
 
 Test 031 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_ras_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_ras_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_ras_debug
 Checking test 032 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 101.116786
-  0: The maximum resident set size (KB)                   = 489996
+  0: The total amount of wall time                        = 101.745525
+  0: The maximum resident set size (KB)                   = 485688
 
 Test 032 control_ras_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_stochy_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_stochy_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_stochy_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_stochy_debug
 Checking test 033 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 116.557444
-  0: The maximum resident set size (KB)                   = 480260
+  0: The total amount of wall time                        = 114.045900
+  0: The maximum resident set size (KB)                   = 480168
 
 Test 033 control_stochy_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_debug_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_debug_p8
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_debug_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_debug_p8
 Checking test 034 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 112.661874
-  0: The maximum resident set size (KB)                   = 832112
+  0: The total amount of wall time                        = 111.242170
+  0: The maximum resident set size (KB)                   = 830168
 
 Test 034 control_debug_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/control_wam_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/control_wam_debug
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/control_wam_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/control_wam_debug
 Checking test 035 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 180.775156
-  0: The maximum resident set size (KB)                   = 190512
+  0: The total amount of wall time                        = 179.416761
+  0: The maximum resident set size (KB)                   = 192128
 
-Test 035 control_wam_debug PASS Tries: 2
+Test 035 control_wam_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/cpld_control_c96_noaero_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/cpld_control_c96_noaero_p8
-Checking test 036 cpld_control_c96_noaero_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/cpld_control_noaero_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/cpld_control_noaero_p8
+Checking test 036 cpld_control_noaero_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
  Comparing sfcf021.tile3.nc .........OK
@@ -993,28 +993,30 @@ Checking test 036 cpld_control_c96_noaero_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1149.191892
-  0: The maximum resident set size (KB)                   = 862176
+  0: The total amount of wall time                        = 1249.298462
+  0: The maximum resident set size (KB)                   = 881124
 
-Test 036 cpld_control_c96_noaero_p8 PASS
+Test 036 cpld_control_noaero_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/cpld_debug_noaero_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/cpld_debug_noaero_p8
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/cpld_debug_noaero_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/cpld_debug_noaero_p8
 Checking test 037 cpld_debug_noaero_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.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
@@ -1048,28 +1050,30 @@ Checking test 037 cpld_debug_noaero_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 580.347310
-  0: The maximum resident set size (KB)                   = 876116
+  0: The total amount of wall time                        = 441.411094
+  0: The maximum resident set size (KB)                   = 888748
 
 Test 037 cpld_debug_noaero_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/GNU/datm_cdeps_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8261/datm_cdeps_control_cfsr
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/GNU/datm_cdeps_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_22111/datm_cdeps_control_cfsr
 Checking test 038 datm_cdeps_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                        = 162.110131
- 0: The maximum resident set size (KB)                   = 623552
+ 0: The total amount of wall time                        = 161.641794
+ 0: The maximum resident set size (KB)                   = 624224
 
 Test 038 datm_cdeps_control_cfsr PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 14:20:27 UTC 2022
-Elapsed time: 00h:47m:26s. Have a nice day!
+Sun May 29 21:59:11 UTC 2022
+Elapsed time: 00h:45m:22s. Have a nice day!
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
index 1244f4ee67..bdbd974013 100644
--- a/tests/RegressionTests_hera.intel.log
+++ b/tests/RegressionTests_hera.intel.log
@@ -1,25 +1,25 @@
-Fri May 27 15:14:43 UTC 2022
+Sun May 29 21:43:45 UTC 2022
 Start Regression test
 
-Compile 001 elapsed time 558 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 002 elapsed time 198 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 332 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 357 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 357 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 006 elapsed time 309 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 007 elapsed time 180 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 152 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 153 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 148 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 546 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 012 elapsed time 545 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 013 elapsed time 176 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 014 elapsed time 110 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 501 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 016 elapsed time 362 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_control_p8
+Compile 001 elapsed time 603 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 002 elapsed time 198 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 364 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 366 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 363 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 006 elapsed time 363 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 007 elapsed time 175 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 157 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 157 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 010 elapsed time 156 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 541 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 012 elapsed time 537 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 013 elapsed time 173 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 014 elapsed time 119 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 015 elapsed time 507 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 016 elapsed time 339 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 392.773535
-  0: The maximum resident set size (KB)                   = 4995112
+  0: The total amount of wall time                        = 405.927503
+  0: The maximum resident set size (KB)                   = 5000548
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,67 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.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.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
  Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-  0: The total amount of wall time                        = 498.292996
-  0: The maximum resident set size (KB)                   = 5477104
-
-Test 002 cpld_2threads_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_decomp_p8
-Checking test 003 cpld_decomp_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,20 +141,18 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 393.243401
-  0: The maximum resident set size (KB)                   = 5170444
+  0: The total amount of wall time                        = 242.208000
+  0: The maximum resident set size (KB)                   = 4969692
 
-Test 003 cpld_decomp_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_mpi_p8
-Checking test 004 cpld_mpi_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -228,6 +165,7 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -263,85 +201,18 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-  0: The total amount of wall time                        = 324.686207
-  0: The maximum resident set size (KB)                   = 4728148
-
-Test 004 cpld_mpi_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_bmark_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_bmark_p8
-Checking test 005 cpld_bmark_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20130401_0600z.nc4 .........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
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1238.691371
-  0: The maximum resident set size (KB)                   = 6113848
+  0: The total amount of wall time                        = 508.184888
+  0: The maximum resident set size (KB)                   = 5490844
 
-Test 005 cpld_bmark_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_control_c96_p8
-Checking test 006 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_decomp_p8
+Checking test 004 cpld_decomp_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -390,16 +261,18 @@ Checking test 006 cpld_control_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 384.609588
-  0: The maximum resident set size (KB)                   = 4983572
+  0: The total amount of wall time                        = 396.463522
+  0: The maximum resident set size (KB)                   = 5178132
 
-Test 006 cpld_control_c96_p8 PASS
+Test 004 cpld_decomp_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_restart_c96_p8
-Checking test 007 cpld_restart_c96_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_mpi_p8
+Checking test 005 cpld_mpi_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -448,29 +321,31 @@ Checking test 007 cpld_restart_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-  0: The total amount of wall time                        = 233.017678
-  0: The maximum resident set size (KB)                   = 4950048
-
-Test 007 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_control_c192_p8
-Checking test 008 cpld_control_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 330.927850
+  0: The maximum resident set size (KB)                   = 4742356
+
+Test 005 cpld_mpi_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_control_c192_p8
+Checking test 006 cpld_control_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -504,31 +379,33 @@ Checking test 008 cpld_control_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-  0: The total amount of wall time                        = 1565.790132
-  0: The maximum resident set size (KB)                   = 5218184
-
-Test 008 cpld_control_c192_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_restart_c192_p8
-Checking test 009 cpld_restart_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
+
+  0: The total amount of wall time                        = 793.449828
+  0: The maximum resident set size (KB)                   = 4864668
+
+Test 006 cpld_control_c192_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_restart_c192_p8
+Checking test 007 cpld_restart_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -562,21 +439,23 @@ Checking test 009 cpld_restart_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 1061.210147
-  0: The maximum resident set size (KB)                   = 5162276
+  0: The total amount of wall time                        = 463.777269
+  0: The maximum resident set size (KB)                   = 4910992
 
-Test 009 cpld_restart_c192_p8 PASS
+Test 007 cpld_restart_c192_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_control_c384_p8
-Checking test 010 cpld_control_c384_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_bmark_p8
+Checking test 008 cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -613,21 +492,23 @@ Checking test 010 cpld_control_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1366.722994
-  0: The maximum resident set size (KB)                   = 6061928
+  0: The total amount of wall time                        = 1205.061700
+  0: The maximum resident set size (KB)                   = 5657236
 
-Test 010 cpld_control_c384_p8 PASS
+Test 008 cpld_bmark_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_restart_c384_p8
-Checking test 011 cpld_restart_c384_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_restart_bmark_p8
+Checking test 009 cpld_restart_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -664,31 +545,33 @@ Checking test 011 cpld_restart_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-  0: The total amount of wall time                        = 828.589992
-  0: The maximum resident set size (KB)                   = 6015624
-
-Test 011 cpld_restart_c384_p8 PASS
-
-
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_debug_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/cpld_debug_p8
-Checking test 012 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 756.450486
+  0: The maximum resident set size (KB)                   = 5610184
+
+Test 009 cpld_restart_bmark_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_debug_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/cpld_debug_p8
+Checking test 010 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -722,18 +605,20 @@ Checking test 012 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1105.208658
-  0: The maximum resident set size (KB)                   = 5038544
+  0: The total amount of wall time                        = 764.582245
+  0: The maximum resident set size (KB)                   = 5069744
 
-Test 012 cpld_debug_p8 PASS
+Test 010 cpld_debug_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control
-Checking test 013 control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control
+Checking test 011 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -779,15 +664,15 @@ Checking test 013 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 124.352788
-  0: The maximum resident set size (KB)                   = 648448
+  0: The total amount of wall time                        = 124.821842
+  0: The maximum resident set size (KB)                   = 646340
 
-Test 013 control PASS
+Test 011 control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_decomp
-Checking test 014 control_decomp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_decomp
+Checking test 012 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -829,29 +714,29 @@ Checking test 014 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 131.362086
-  0: The maximum resident set size (KB)                   = 633960
+  0: The total amount of wall time                        = 131.183523
+  0: The maximum resident set size (KB)                   = 633652
 
-Test 014 control_decomp PASS
+Test 012 control_decomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_2dwrtdecomp
-Checking test 015 control_2dwrtdecomp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_2dwrtdecomp
+Checking test 013 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 118.217865
-  0: The maximum resident set size (KB)                   = 644488
+  0: The total amount of wall time                        = 119.013727
+  0: The maximum resident set size (KB)                   = 638928
 
-Test 015 control_2dwrtdecomp PASS
+Test 013 control_2dwrtdecomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_2threads
-Checking test 016 control_2threads results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_2threads
+Checking test 014 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -893,15 +778,15 @@ Checking test 016 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 154.331278
- 0: The maximum resident set size (KB)                   = 697788
+ 0: The total amount of wall time                        = 155.942976
+ 0: The maximum resident set size (KB)                   = 695780
 
-Test 016 control_2threads PASS
+Test 014 control_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_restart
-Checking test 017 control_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_restart
+Checking test 015 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -939,15 +824,15 @@ Checking test 017 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 65.118482
-  0: The maximum resident set size (KB)                   = 465524
+  0: The total amount of wall time                        = 65.714491
+  0: The maximum resident set size (KB)                   = 469956
 
-Test 017 control_restart PASS
+Test 015 control_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_fhzero
-Checking test 018 control_fhzero results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_fhzero
+Checking test 016 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -989,15 +874,15 @@ Checking test 018 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 117.778376
-  0: The maximum resident set size (KB)                   = 643152
+  0: The total amount of wall time                        = 118.071043
+  0: The maximum resident set size (KB)                   = 644368
 
-Test 018 control_fhzero PASS
+Test 016 control_fhzero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_CubedSphereGrid
-Checking test 019 control_CubedSphereGrid results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_CubedSphereGrid
+Checking test 017 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -1023,15 +908,15 @@ Checking test 019 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 120.240361
-  0: The maximum resident set size (KB)                   = 642348
+  0: The total amount of wall time                        = 119.824752
+  0: The maximum resident set size (KB)                   = 643040
 
-Test 019 control_CubedSphereGrid PASS
+Test 017 control_CubedSphereGrid PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_latlon
-Checking test 020 control_latlon results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_latlon
+Checking test 018 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1041,33 +926,33 @@ Checking test 020 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 122.260460
-  0: The maximum resident set size (KB)                   = 640108
+  0: The total amount of wall time                        = 121.678504
+  0: The maximum resident set size (KB)                   = 647128
 
-Test 020 control_latlon PASS
+Test 018 control_latlon PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_wrtGauss_netcdf_parallel
-Checking test 021 control_wrtGauss_netcdf_parallel results ....
- Comparing sfcf000.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_wrtGauss_netcdf_parallel
+Checking test 019 control_wrtGauss_netcdf_parallel results ....
+ Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
- Comparing atmf000.nc ............ALT CHECK......OK
+ Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF00 .........OK
  Comparing GFSFLX.GrbF24 .........OK
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 125.851356
-  0: The maximum resident set size (KB)                   = 643772
+  0: The total amount of wall time                        = 125.107649
+  0: The maximum resident set size (KB)                   = 640864
 
-Test 021 control_wrtGauss_netcdf_parallel PASS
+Test 019 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_c48
-Checking test 022 control_c48 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_c48
+Checking test 020 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1105,15 +990,15 @@ Checking test 022 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 335.153914
-0: The maximum resident set size (KB)                   = 819484
+0: The total amount of wall time                        = 331.507655
+0: The maximum resident set size (KB)                   = 806776
 
-Test 022 control_c48 PASS
+Test 020 control_c48 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_c192
-Checking test 023 control_c192 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_c192
+Checking test 021 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1123,15 +1008,15 @@ Checking test 023 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 483.359332
-  0: The maximum resident set size (KB)                   = 801124
+  0: The total amount of wall time                        = 480.258416
+  0: The maximum resident set size (KB)                   = 795756
 
-Test 023 control_c192 PASS
+Test 021 control_c192 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_c384
-Checking test 024 control_c384 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_c384
+Checking test 022 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1141,15 +1026,15 @@ Checking test 024 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 650.529851
-  0: The maximum resident set size (KB)                   = 1088968
+  0: The total amount of wall time                        = 655.186646
+  0: The maximum resident set size (KB)                   = 1087952
 
-Test 024 control_c384 PASS
+Test 022 control_c384 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_c384gdas
-Checking test 025 control_c384gdas results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_c384gdas
+Checking test 023 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1191,15 +1076,15 @@ Checking test 025 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 589.930905
-  0: The maximum resident set size (KB)                   = 1245584
+  0: The total amount of wall time                        = 585.681352
+  0: The maximum resident set size (KB)                   = 1241012
 
-Test 025 control_c384gdas PASS
+Test 023 control_c384gdas PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_stochy
-Checking test 026 control_stochy results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_stochy
+Checking test 024 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1209,29 +1094,29 @@ Checking test 026 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 81.319316
-  0: The maximum resident set size (KB)                   = 654588
+  0: The total amount of wall time                        = 83.796202
+  0: The maximum resident set size (KB)                   = 648148
 
-Test 026 control_stochy PASS
+Test 024 control_stochy PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_stochy_restart
-Checking test 027 control_stochy_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_stochy_restart
+Checking test 025 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 43.290838
-  0: The maximum resident set size (KB)                   = 478628
+  0: The total amount of wall time                        = 43.446230
+  0: The maximum resident set size (KB)                   = 485760
 
-Test 027 control_stochy_restart PASS
+Test 025 control_stochy_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_lndp
-Checking test 028 control_lndp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_lndp
+Checking test 026 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1241,15 +1126,15 @@ Checking test 028 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 74.492100
-  0: The maximum resident set size (KB)                   = 644688
+  0: The total amount of wall time                        = 72.698900
+  0: The maximum resident set size (KB)                   = 645908
 
-Test 028 control_lndp PASS
+Test 026 control_lndp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_iovr4
-Checking test 029 control_iovr4 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_iovr4
+Checking test 027 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1263,15 +1148,15 @@ Checking test 029 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 124.398233
-  0: The maximum resident set size (KB)                   = 650028
+  0: The total amount of wall time                        = 125.703622
+  0: The maximum resident set size (KB)                   = 641656
 
-Test 029 control_iovr4 PASS
+Test 027 control_iovr4 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_iovr5
-Checking test 030 control_iovr5 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_iovr5
+Checking test 028 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1285,15 +1170,15 @@ Checking test 030 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 124.734889
-  0: The maximum resident set size (KB)                   = 642844
+  0: The total amount of wall time                        = 124.865192
+  0: The maximum resident set size (KB)                   = 638564
 
-Test 030 control_iovr5 PASS
+Test 028 control_iovr5 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_p8
-Checking test 031 control_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_p8
+Checking test 029 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1339,15 +1224,15 @@ Checking test 031 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 165.052022
-  0: The maximum resident set size (KB)                   = 1035764
+  0: The total amount of wall time                        = 165.993038
+  0: The maximum resident set size (KB)                   = 1037552
 
-Test 031 control_p8 PASS
+Test 029 control_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_p8_lndp
-Checking test 032 control_p8_lndp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_p8_lndp
+Checking test 030 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1365,15 +1250,15 @@ Checking test 032 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-  0: The total amount of wall time                        = 316.009273
-  0: The maximum resident set size (KB)                   = 1034392
+  0: The total amount of wall time                        = 317.347848
+  0: The maximum resident set size (KB)                   = 1040212
 
-Test 032 control_p8_lndp PASS
+Test 030 control_p8_lndp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_restart_p8
-Checking test 033 control_restart_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_restart_p8
+Checking test 031 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1411,15 +1296,15 @@ Checking test 033 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 89.120207
-  0: The maximum resident set size (KB)                   = 861204
+  0: The total amount of wall time                        = 88.823066
+  0: The maximum resident set size (KB)                   = 872448
 
-Test 033 control_restart_p8 PASS
+Test 031 control_restart_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_decomp_p8
-Checking test 034 control_decomp_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_decomp_p8
+Checking test 032 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1461,15 +1346,15 @@ Checking test 034 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 171.695509
-  0: The maximum resident set size (KB)                   = 1023368
+  0: The total amount of wall time                        = 171.779264
+  0: The maximum resident set size (KB)                   = 1031312
 
-Test 034 control_decomp_p8 PASS
+Test 032 control_decomp_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_2threads_p8
-Checking test 035 control_2threads_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_2threads_p8
+Checking test 033 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1511,15 +1396,15 @@ Checking test 035 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 201.360272
- 0: The maximum resident set size (KB)                   = 1109244
+ 0: The total amount of wall time                        = 201.879673
+ 0: The maximum resident set size (KB)                   = 1112952
 
-Test 035 control_2threads_p8 PASS
+Test 033 control_2threads_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_p8_rrtmgp
-Checking test 036 control_p8_rrtmgp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_p8_rrtmgp
+Checking test 034 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1565,15 +1450,15 @@ Checking test 036 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 195.162506
-  0: The maximum resident set size (KB)                   = 1163428
+  0: The total amount of wall time                        = 196.729536
+  0: The maximum resident set size (KB)                   = 1160072
 
-Test 036 control_p8_rrtmgp PASS
+Test 034 control_p8_rrtmgp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_control
-Checking test 037 regional_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_control
+Checking test 035 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1583,58 +1468,58 @@ Checking test 037 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 328.888240
- 0: The maximum resident set size (KB)                   = 817144
+ 0: The total amount of wall time                        = 329.130538
+ 0: The maximum resident set size (KB)                   = 820004
 
-Test 037 regional_control PASS
+Test 035 regional_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_restart
-Checking test 038 regional_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_restart
+Checking test 036 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 181.900697
- 0: The maximum resident set size (KB)                   = 821320
+ 0: The total amount of wall time                        = 181.680349
+ 0: The maximum resident set size (KB)                   = 824888
 
-Test 038 regional_restart PASS
+Test 036 regional_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_control_2dwrtdecomp
-Checking test 039 regional_control_2dwrtdecomp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_control_2dwrtdecomp
+Checking test 037 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 327.927948
- 0: The maximum resident set size (KB)                   = 831376
+ 0: The total amount of wall time                        = 329.046294
+ 0: The maximum resident set size (KB)                   = 817816
 
-Test 039 regional_control_2dwrtdecomp PASS
+Test 037 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_noquilt
-Checking test 040 regional_noquilt results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_noquilt
+Checking test 038 regional_noquilt 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                        = 338.270444
- 0: The maximum resident set size (KB)                   = 805588
+ 0: The total amount of wall time                        = 343.023600
+ 0: The maximum resident set size (KB)                   = 793440
 
-Test 040 regional_noquilt PASS
+Test 038 regional_noquilt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_2threads
-Checking test 041 regional_2threads results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_2threads
+Checking test 039 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1644,29 +1529,29 @@ Checking test 041 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 231.742947
- 0: The maximum resident set size (KB)                   = 830208
+ 0: The total amount of wall time                        = 232.008413
+ 0: The maximum resident set size (KB)                   = 827828
 
-Test 041 regional_2threads PASS
+Test 039 regional_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_netcdf_parallel
-Checking test 042 regional_netcdf_parallel results ....
- Comparing dynf000.nc ............ALT CHECK......OK
- Comparing dynf024.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_netcdf_parallel
+Checking test 040 regional_netcdf_parallel results ....
+ Comparing dynf000.nc .........OK
+ Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 325.844083
- 0: The maximum resident set size (KB)                   = 823392
+ 0: The total amount of wall time                        = 325.985696
+ 0: The maximum resident set size (KB)                   = 816152
 
-Test 042 regional_netcdf_parallel PASS
+Test 040 regional_netcdf_parallel PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_3km
-Checking test 043 regional_3km results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_3km
+Checking test 041 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1676,15 +1561,15 @@ Checking test 043 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 253.729529
-  0: The maximum resident set size (KB)                   = 886160
+  0: The total amount of wall time                        = 249.745423
+  0: The maximum resident set size (KB)                   = 890496
 
-Test 043 regional_3km PASS
+Test 041 regional_3km PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_control
-Checking test 044 rap_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_control
+Checking test 042 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1730,15 +1615,15 @@ Checking test 044 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 430.451682
-  0: The maximum resident set size (KB)                   = 1039820
+  0: The total amount of wall time                        = 432.622056
+  0: The maximum resident set size (KB)                   = 1031344
 
-Test 044 rap_control PASS
+Test 042 rap_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_rrtmgp
-Checking test 045 rap_rrtmgp results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_rrtmgp
+Checking test 043 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1784,15 +1669,15 @@ Checking test 045 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 462.310083
-  0: The maximum resident set size (KB)                   = 1197504
+  0: The total amount of wall time                        = 469.467584
+  0: The maximum resident set size (KB)                   = 1196948
 
-Test 045 rap_rrtmgp PASS
+Test 043 rap_rrtmgp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_spp_sppt_shum_skeb
-Checking test 046 regional_spp_sppt_shum_skeb results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_spp_sppt_shum_skeb
+Checking test 044 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1802,15 +1687,15 @@ Checking test 046 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 295.130841
-  0: The maximum resident set size (KB)                   = 1199744
+  0: The total amount of wall time                        = 296.745102
+  0: The maximum resident set size (KB)                   = 1201176
 
-Test 046 regional_spp_sppt_shum_skeb PASS
+Test 044 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_2threads
-Checking test 047 rap_2threads results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_2threads
+Checking test 045 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1856,15 +1741,15 @@ Checking test 047 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 515.495186
- 0: The maximum resident set size (KB)                   = 1096020
+ 0: The total amount of wall time                        = 519.656942
+ 0: The maximum resident set size (KB)                   = 1094824
 
-Test 047 rap_2threads PASS
+Test 045 rap_2threads PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_restart
-Checking test 048 rap_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_restart
+Checking test 046 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1902,15 +1787,15 @@ Checking test 048 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 219.705225
-  0: The maximum resident set size (KB)                   = 935656
+  0: The total amount of wall time                        = 219.430378
+  0: The maximum resident set size (KB)                   = 931676
 
-Test 048 rap_restart PASS
+Test 046 rap_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_sfcdiff
-Checking test 049 rap_sfcdiff results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_sfcdiff
+Checking test 047 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1956,15 +1841,15 @@ Checking test 049 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 433.247097
-  0: The maximum resident set size (KB)                   = 1038116
+  0: The total amount of wall time                        = 435.042065
+  0: The maximum resident set size (KB)                   = 1046840
 
-Test 049 rap_sfcdiff PASS
+Test 047 rap_sfcdiff PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_sfcdiff_restart
-Checking test 050 rap_sfcdiff_restart results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_sfcdiff_restart
+Checking test 048 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -2002,15 +1887,15 @@ Checking test 050 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 219.550850
-  0: The maximum resident set size (KB)                   = 946416
+  0: The total amount of wall time                        = 220.765149
+  0: The maximum resident set size (KB)                   = 945456
 
-Test 050 rap_sfcdiff_restart PASS
+Test 048 rap_sfcdiff_restart PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hrrr_control
-Checking test 051 hrrr_control results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hrrr_control
+Checking test 049 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2056,15 +1941,15 @@ Checking test 051 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 414.316325
-  0: The maximum resident set size (KB)                   = 1029240
+  0: The total amount of wall time                        = 417.154393
+  0: The maximum resident set size (KB)                   = 1029084
 
-Test 051 hrrr_control PASS
+Test 049 hrrr_control PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_v1beta
-Checking test 052 rrfs_v1beta results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_v1beta
+Checking test 050 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2110,15 +1995,15 @@ Checking test 052 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 422.911311
-  0: The maximum resident set size (KB)                   = 1034484
+  0: The total amount of wall time                        = 423.163531
+  0: The maximum resident set size (KB)                   = 1030392
 
-Test 052 rrfs_v1beta PASS
+Test 050 rrfs_v1beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_v1nssl
-Checking test 053 rrfs_v1nssl results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_v1nssl
+Checking test 051 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2132,15 +2017,15 @@ Checking test 053 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 497.795149
-  0: The maximum resident set size (KB)                   = 699128
+  0: The total amount of wall time                        = 499.077576
+  0: The maximum resident set size (KB)                   = 701916
 
-Test 053 rrfs_v1nssl PASS
+Test 051 rrfs_v1nssl PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_v1nssl_nohailnoccn
-Checking test 054 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_v1nssl_nohailnoccn
+Checking test 052 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2154,15 +2039,15 @@ Checking test 054 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 488.676062
-  0: The maximum resident set size (KB)                   = 728856
+  0: The total amount of wall time                        = 489.643399
+  0: The maximum resident set size (KB)                   = 737600
 
-Test 054 rrfs_v1nssl_nohailnoccn PASS
+Test 052 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_conus13km_hrrr_warm
-Checking test 055 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_conus13km_hrrr_warm
+Checking test 053 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2170,15 +2055,15 @@ Checking test 055 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 175.635936
-  0: The maximum resident set size (KB)                   = 922356
+  0: The total amount of wall time                        = 175.658874
+  0: The maximum resident set size (KB)                   = 925440
 
-Test 055 rrfs_conus13km_hrrr_warm PASS
+Test 053 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_conus13km_radar_tten_warm
-Checking test 056 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_conus13km_radar_tten_warm
+Checking test 054 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2186,15 +2071,15 @@ Checking test 056 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 178.174845
-  0: The maximum resident set size (KB)                   = 926332
+  0: The total amount of wall time                        = 178.438010
+  0: The maximum resident set size (KB)                   = 927136
 
-Test 056 rrfs_conus13km_radar_tten_warm PASS
+Test 054 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_smoke_conus13km_hrrr_warm
-Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_smoke_conus13km_hrrr_warm
+Checking test 055 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2202,15 +2087,15 @@ Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 196.118639
-  0: The maximum resident set size (KB)                   = 948356
+  0: The total amount of wall time                        = 196.341607
+  0: The maximum resident set size (KB)                   = 953968
 
-Test 057 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 055 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_csawmg
-Checking test 058 control_csawmg results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_csawmg
+Checking test 056 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2220,15 +2105,15 @@ Checking test 058 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 325.252861
-  0: The maximum resident set size (KB)                   = 752848
+  0: The total amount of wall time                        = 326.955765
+  0: The maximum resident set size (KB)                   = 751740
 
-Test 058 control_csawmg PASS
+Test 056 control_csawmg PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_csawmgt
-Checking test 059 control_csawmgt results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_csawmgt
+Checking test 057 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2238,15 +2123,15 @@ Checking test 059 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 321.156681
-  0: The maximum resident set size (KB)                   = 751636
+  0: The total amount of wall time                        = 321.792581
+  0: The maximum resident set size (KB)                   = 753816
 
-Test 059 control_csawmgt PASS
+Test 057 control_csawmgt PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_flake
-Checking test 060 control_flake results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_flake
+Checking test 058 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2256,15 +2141,15 @@ Checking test 060 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 207.336590
-  0: The maximum resident set size (KB)                   = 761548
+  0: The total amount of wall time                        = 209.722976
+  0: The maximum resident set size (KB)                   = 766928
 
-Test 060 control_flake PASS
+Test 058 control_flake PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_ras
-Checking test 061 control_ras results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_ras
+Checking test 059 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2274,15 +2159,15 @@ Checking test 061 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 167.928749
-  0: The maximum resident set size (KB)                   = 714324
+  0: The total amount of wall time                        = 167.554370
+  0: The maximum resident set size (KB)                   = 719112
 
-Test 061 control_ras PASS
+Test 059 control_ras PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson
-Checking test 062 control_thompson results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson
+Checking test 060 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2292,15 +2177,15 @@ Checking test 062 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 232.411520
-  0: The maximum resident set size (KB)                   = 1071928
+  0: The total amount of wall time                        = 231.445348
+  0: The maximum resident set size (KB)                   = 1079372
 
-Test 062 control_thompson PASS
+Test 060 control_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson_no_aero
-Checking test 063 control_thompson_no_aero results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson_no_aero
+Checking test 061 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2310,55 +2195,55 @@ Checking test 063 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 217.037023
-  0: The maximum resident set size (KB)                   = 1057972
+  0: The total amount of wall time                        = 218.098543
+  0: The maximum resident set size (KB)                   = 1058636
 
-Test 063 control_thompson_no_aero PASS
+Test 061 control_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_wam
-Checking test 064 control_wam results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_wam
+Checking test 062 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 101.479063
-  0: The maximum resident set size (KB)                   = 620628
+  0: The total amount of wall time                        = 102.450470
+  0: The maximum resident set size (KB)                   = 615752
 
-Test 064 control_wam PASS
+Test 062 control_wam PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_debug
-Checking test 065 control_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_debug
+Checking test 063 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 144.930774
-  0: The maximum resident set size (KB)                   = 803936
+  0: The total amount of wall time                        = 146.361647
+  0: The maximum resident set size (KB)                   = 807396
 
-Test 065 control_debug PASS
+Test 063 control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_2threads_debug
-Checking test 066 control_2threads_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_2threads_debug
+Checking test 064 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
- 0: The total amount of wall time                        = 214.001846
- 0: The maximum resident set size (KB)                   = 854412
+ 0: The total amount of wall time                        = 210.509613
+ 0: The maximum resident set size (KB)                   = 859564
 
-Test 066 control_2threads_debug PASS
+Test 064 control_2threads_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_CubedSphereGrid_debug
-Checking test 067 control_CubedSphereGrid_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_CubedSphereGrid_debug
+Checking test 065 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -2384,736 +2269,740 @@ Checking test 067 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 160.344080
-  0: The maximum resident set size (KB)                   = 799128
+  0: The total amount of wall time                        = 156.393496
+  0: The maximum resident set size (KB)                   = 805684
 
-Test 067 control_CubedSphereGrid_debug PASS
+Test 065 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_wrtGauss_netcdf_parallel_debug
-Checking test 068 control_wrtGauss_netcdf_parallel_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_wrtGauss_netcdf_parallel_debug
+Checking test 066 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 148.191825
-  0: The maximum resident set size (KB)                   = 807536
+  0: The total amount of wall time                        = 147.690029
+  0: The maximum resident set size (KB)                   = 805108
 
-Test 068 control_wrtGauss_netcdf_parallel_debug PASS
+Test 066 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_stochy_debug
-Checking test 069 control_stochy_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_stochy_debug
+Checking test 067 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 165.779391
-  0: The maximum resident set size (KB)                   = 815168
+  0: The total amount of wall time                        = 165.763273
+  0: The maximum resident set size (KB)                   = 818332
 
-Test 069 control_stochy_debug PASS
+Test 067 control_stochy_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_lndp_debug
-Checking test 070 control_lndp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_lndp_debug
+Checking test 068 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 146.949931
-  0: The maximum resident set size (KB)                   = 803220
+  0: The total amount of wall time                        = 145.589660
+  0: The maximum resident set size (KB)                   = 810316
 
-Test 070 control_lndp_debug PASS
+Test 068 control_lndp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_csawmg_debug
-Checking test 071 control_csawmg_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_csawmg_debug
+Checking test 069 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 224.449092
-  0: The maximum resident set size (KB)                   = 855228
+  0: The total amount of wall time                        = 229.538590
+  0: The maximum resident set size (KB)                   = 855852
 
-Test 071 control_csawmg_debug PASS
+Test 069 control_csawmg_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_csawmgt_debug
-Checking test 072 control_csawmgt_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_csawmgt_debug
+Checking test 070 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 217.946111
-  0: The maximum resident set size (KB)                   = 850988
+  0: The total amount of wall time                        = 223.033402
+  0: The maximum resident set size (KB)                   = 858352
 
-Test 072 control_csawmgt_debug PASS
+Test 070 control_csawmgt_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_ras_debug
-Checking test 073 control_ras_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_ras_debug
+Checking test 071 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 149.482294
-  0: The maximum resident set size (KB)                   = 817836
+  0: The total amount of wall time                        = 149.609284
+  0: The maximum resident set size (KB)                   = 821264
 
-Test 073 control_ras_debug PASS
+Test 071 control_ras_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_diag_debug
-Checking test 074 control_diag_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_diag_debug
+Checking test 072 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 157.347832
-  0: The maximum resident set size (KB)                   = 862544
+  0: The total amount of wall time                        = 154.244870
+  0: The maximum resident set size (KB)                   = 864996
 
-Test 074 control_diag_debug PASS
+Test 072 control_diag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_debug_p8
-Checking test 075 control_debug_p8 results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_debug_p8
+Checking test 073 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 165.564203
-  0: The maximum resident set size (KB)                   = 1197200
+  0: The total amount of wall time                        = 159.176612
+  0: The maximum resident set size (KB)                   = 1192428
 
-Test 075 control_debug_p8 PASS
+Test 073 control_debug_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson_debug
-Checking test 076 control_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson_debug
+Checking test 074 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 169.114813
-  0: The maximum resident set size (KB)                   = 1168548
+  0: The total amount of wall time                        = 173.591599
+  0: The maximum resident set size (KB)                   = 1169952
 
-Test 076 control_thompson_debug PASS
+Test 074 control_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson_no_aero_debug
-Checking test 077 control_thompson_no_aero_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson_no_aero_debug
+Checking test 075 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 166.771780
-  0: The maximum resident set size (KB)                   = 1170436
+  0: The total amount of wall time                        = 168.021326
+  0: The maximum resident set size (KB)                   = 1165384
 
-Test 077 control_thompson_no_aero_debug PASS
+Test 075 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson_extdiag_debug
-Checking test 078 control_thompson_extdiag_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson_extdiag_debug
+Checking test 076 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 182.116254
-  0: The maximum resident set size (KB)                   = 1201824
+  0: The total amount of wall time                        = 180.443519
+  0: The maximum resident set size (KB)                   = 1203380
 
-Test 078 control_thompson_extdiag_debug PASS
+Test 076 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_thompson_progcld_thompson_debug
-Checking test 079 control_thompson_progcld_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_thompson_progcld_thompson_debug
+Checking test 077 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 168.879620
-  0: The maximum resident set size (KB)                   = 1176764
+  0: The total amount of wall time                        = 175.961633
+  0: The maximum resident set size (KB)                   = 1176468
 
-Test 079 control_thompson_progcld_thompson_debug PASS
+Test 077 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/regional_debug
-Checking test 080 regional_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/regional_debug
+Checking test 078 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
- 0: The total amount of wall time                        = 236.732966
- 0: The maximum resident set size (KB)                   = 844604
+ 0: The total amount of wall time                        = 238.961756
+ 0: The maximum resident set size (KB)                   = 848940
 
-Test 080 regional_debug PASS
+Test 078 regional_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_control_debug
-Checking test 081 rap_control_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_control_debug
+Checking test 079 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 264.525771
-  0: The maximum resident set size (KB)                   = 1185732
+  0: The total amount of wall time                        = 260.367078
+  0: The maximum resident set size (KB)                   = 1183668
 
-Test 081 rap_control_debug PASS
+Test 079 rap_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_unified_drag_suite_debug
-Checking test 082 rap_unified_drag_suite_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_unified_drag_suite_debug
+Checking test 080 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 265.798481
-  0: The maximum resident set size (KB)                   = 1187240
+  0: The total amount of wall time                        = 260.436686
+  0: The maximum resident set size (KB)                   = 1182388
 
-Test 082 rap_unified_drag_suite_debug PASS
+Test 080 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_diag_debug
-Checking test 083 rap_diag_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_diag_debug
+Checking test 081 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 274.810629
-  0: The maximum resident set size (KB)                   = 1262896
+  0: The total amount of wall time                        = 279.923544
+  0: The maximum resident set size (KB)                   = 1261380
 
-Test 083 rap_diag_debug PASS
+Test 081 rap_diag_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_cires_ugwp_debug
-Checking test 084 rap_cires_ugwp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_cires_ugwp_debug
+Checking test 082 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 264.826694
-  0: The maximum resident set size (KB)                   = 1185472
+  0: The total amount of wall time                        = 267.389556
+  0: The maximum resident set size (KB)                   = 1192272
 
-Test 084 rap_cires_ugwp_debug PASS
+Test 082 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_unified_ugwp_debug
-Checking test 085 rap_unified_ugwp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_unified_ugwp_debug
+Checking test 083 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 269.355958
-  0: The maximum resident set size (KB)                   = 1184396
+  0: The total amount of wall time                        = 264.905926
+  0: The maximum resident set size (KB)                   = 1180256
 
-Test 085 rap_unified_ugwp_debug PASS
+Test 083 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_lndp_debug
-Checking test 086 rap_lndp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_lndp_debug
+Checking test 084 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 263.280206
-  0: The maximum resident set size (KB)                   = 1188084
+  0: The total amount of wall time                        = 264.057185
+  0: The maximum resident set size (KB)                   = 1181204
 
-Test 086 rap_lndp_debug PASS
+Test 084 rap_lndp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_flake_debug
-Checking test 087 rap_flake_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_flake_debug
+Checking test 085 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 262.334174
-  0: The maximum resident set size (KB)                   = 1188360
+  0: The total amount of wall time                        = 258.313884
+  0: The maximum resident set size (KB)                   = 1179096
 
-Test 087 rap_flake_debug PASS
+Test 085 rap_flake_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_progcld_thompson_debug
-Checking test 088 rap_progcld_thompson_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_progcld_thompson_debug
+Checking test 086 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 267.188771
-  0: The maximum resident set size (KB)                   = 1178712
+  0: The total amount of wall time                        = 263.714200
+  0: The maximum resident set size (KB)                   = 1185536
 
-Test 088 rap_progcld_thompson_debug PASS
+Test 086 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_noah_debug
-Checking test 089 rap_noah_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_noah_debug
+Checking test 087 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 260.600504
-  0: The maximum resident set size (KB)                   = 1186212
+  0: The total amount of wall time                        = 260.755685
+  0: The maximum resident set size (KB)                   = 1180104
 
-Test 089 rap_noah_debug PASS
+Test 087 rap_noah_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_rrtmgp_debug
-Checking test 090 rap_rrtmgp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_rrtmgp_debug
+Checking test 088 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 447.468742
-  0: The maximum resident set size (KB)                   = 1316212
+  0: The total amount of wall time                        = 444.512174
+  0: The maximum resident set size (KB)                   = 1317684
 
-Test 090 rap_rrtmgp_debug PASS
+Test 088 rap_rrtmgp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_sfcdiff_debug
-Checking test 091 rap_sfcdiff_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_sfcdiff_debug
+Checking test 089 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 259.229287
-  0: The maximum resident set size (KB)                   = 1182748
+  0: The total amount of wall time                        = 257.524898
+  0: The maximum resident set size (KB)                   = 1186332
 
-Test 091 rap_sfcdiff_debug PASS
+Test 089 rap_sfcdiff_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 092 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 090 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 435.682810
-  0: The maximum resident set size (KB)                   = 1183140
+  0: The total amount of wall time                        = 436.906215
+  0: The maximum resident set size (KB)                   = 1185000
 
-Test 092 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 090 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/rrfs_v1beta_debug
-Checking test 093 rrfs_v1beta_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/rrfs_v1beta_debug
+Checking test 091 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 261.937106
-  0: The maximum resident set size (KB)                   = 1175424
+  0: The total amount of wall time                        = 261.972545
+  0: The maximum resident set size (KB)                   = 1181792
 
-Test 093 rrfs_v1beta_debug PASS
+Test 091 rrfs_v1beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_wam_debug
-Checking test 094 control_wam_debug results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_wam_debug
+Checking test 092 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 269.612048
-  0: The maximum resident set size (KB)                   = 524392
+  0: The total amount of wall time                        = 275.152147
+  0: The maximum resident set size (KB)                   = 522180
 
-Test 094 control_wam_debug PASS
+Test 092 control_wam_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_atm
-Checking test 095 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_atm
+Checking test 093 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 315.797471
-  0: The maximum resident set size (KB)                   = 979352
+  0: The total amount of wall time                        = 320.551060
+  0: The maximum resident set size (KB)                   = 984076
 
-Test 095 hafs_regional_atm PASS
+Test 093 hafs_regional_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_atm_thompson_gfdlsf
-Checking test 096 hafs_regional_atm_thompson_gfdlsf results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_atm_thompson_gfdlsf
+Checking test 094 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-  0: The total amount of wall time                        = 391.025364
-  0: The maximum resident set size (KB)                   = 1353952
+  0: The total amount of wall time                        = 404.349304
+  0: The maximum resident set size (KB)                   = 1350976
 
-Test 096 hafs_regional_atm_thompson_gfdlsf PASS
+Test 094 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_atm_ocn
-Checking test 097 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_atm_ocn
+Checking test 095 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 398.343131
-  0: The maximum resident set size (KB)                   = 1211408
+  0: The total amount of wall time                        = 396.210004
+  0: The maximum resident set size (KB)                   = 1199984
 
-Test 097 hafs_regional_atm_ocn PASS
+Test 095 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_atm_wav
-Checking test 098 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_atm_wav
+Checking test 096 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 750.617112
-  0: The maximum resident set size (KB)                   = 1196672
+  0: The total amount of wall time                        = 743.049130
+  0: The maximum resident set size (KB)                   = 1230928
 
-Test 098 hafs_regional_atm_wav PASS
+Test 096 hafs_regional_atm_wav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_atm_ocn_wav
-Checking test 099 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_atm_ocn_wav
+Checking test 097 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 840.227620
-  0: The maximum resident set size (KB)                   = 1168616
+  0: The total amount of wall time                        = 841.852214
+  0: The maximum resident set size (KB)                   = 1199128
 
-Test 099 hafs_regional_atm_ocn_wav PASS
+Test 097 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_1nest_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_1nest_atm
-Checking test 100 hafs_regional_1nest_atm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_1nest_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_1nest_atm
+Checking test 098 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 452.601327
-  0: The maximum resident set size (KB)                   = 533536
+  0: The total amount of wall time                        = 451.280137
+  0: The maximum resident set size (KB)                   = 529940
 
-Test 100 hafs_regional_1nest_atm PASS
+Test 098 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_telescopic_2nests_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_telescopic_2nests_atm
-Checking test 101 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_telescopic_2nests_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_telescopic_2nests_atm
+Checking test 099 hafs_regional_telescopic_2nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-  0: The total amount of wall time                        = 504.907146
-  0: The maximum resident set size (KB)                   = 589736
+  0: The total amount of wall time                        = 502.925491
+  0: The maximum resident set size (KB)                   = 590928
 
-Test 101 hafs_regional_telescopic_2nests_atm PASS
+Test 099 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_1nest_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_global_1nest_atm
-Checking test 102 hafs_global_1nest_atm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_1nest_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_global_1nest_atm
+Checking test 100 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 209.161121
-  0: The maximum resident set size (KB)                   = 384104
+  0: The total amount of wall time                        = 208.389724
+  0: The maximum resident set size (KB)                   = 380620
 
-Test 102 hafs_global_1nest_atm PASS
+Test 100 hafs_global_1nest_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_multiple_4nests_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_global_multiple_4nests_atm
-Checking test 103 hafs_global_multiple_4nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_multiple_4nests_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_global_multiple_4nests_atm
+Checking test 101 hafs_global_multiple_4nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing atm.nest05.f006.nc .........OK
- Comparing sfc.nest05.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest05.f006.nc .........OK
 
-  0: The total amount of wall time                        = 568.632177
-  0: The maximum resident set size (KB)                   = 399964
+  0: The total amount of wall time                        = 567.922554
+  0: The maximum resident set size (KB)                   = 383804
 
-Test 103 hafs_global_multiple_4nests_atm PASS
+Test 101 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_specified_moving_1nest_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_specified_moving_1nest_atm
-Checking test 104 hafs_regional_specified_moving_1nest_atm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_specified_moving_1nest_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_specified_moving_1nest_atm
+Checking test 102 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 273.267459
-  0: The maximum resident set size (KB)                   = 542352
+  0: The total amount of wall time                        = 272.261235
+  0: The maximum resident set size (KB)                   = 548016
 
-Test 104 hafs_regional_specified_moving_1nest_atm PASS
+Test 102 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_storm_following_1nest_atm
-Checking test 105 hafs_regional_storm_following_1nest_atm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_storm_following_1nest_atm
+Checking test 103 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 264.027061
-  0: The maximum resident set size (KB)                   = 543816
+  0: The total amount of wall time                        = 260.722748
+  0: The maximum resident set size (KB)                   = 539868
 
-Test 105 hafs_regional_storm_following_1nest_atm PASS
+Test 103 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_storm_following_1nest_atm_ocn
-Checking test 106 hafs_regional_storm_following_1nest_atm_ocn results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_storm_following_1nest_atm_ocn
+Checking test 104 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-  0: The total amount of wall time                        = 267.802783
-  0: The maximum resident set size (KB)                   = 628600
+  0: The total amount of wall time                        = 272.068451
+  0: The maximum resident set size (KB)                   = 621864
 
-Test 106 hafs_regional_storm_following_1nest_atm_ocn PASS
+Test 104 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_storm_following_1nest_atm_ocn_wav
-Checking test 107 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_storm_following_1nest_atm_ocn_wav
+Checking test 105 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 607.679224
-  0: The maximum resident set size (KB)                   = 518796
+  0: The total amount of wall time                        = 623.456029
+  0: The maximum resident set size (KB)                   = 559656
 
-Test 107 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
+Test 105 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_storm_following_1nest_atm
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_global_storm_following_1nest_atm
-Checking test 108 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_storm_following_1nest_atm
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_global_storm_following_1nest_atm
+Checking test 106 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 78.176043
-  0: The maximum resident set size (KB)                   = 396548
+  0: The total amount of wall time                        = 77.320345
+  0: The maximum resident set size (KB)                   = 400772
 
-Test 108 hafs_global_storm_following_1nest_atm PASS
+Test 106 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_docn
-Checking test 109 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_docn
+Checking test 107 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 396.578653
-  0: The maximum resident set size (KB)                   = 1212340
+  0: The total amount of wall time                        = 392.084479
+  0: The maximum resident set size (KB)                   = 1207220
 
-Test 109 hafs_regional_docn PASS
+Test 107 hafs_regional_docn PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_docn_oisst
-Checking test 110 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_docn_oisst
+Checking test 108 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 390.373149
-  0: The maximum resident set size (KB)                   = 1201632
+  0: The total amount of wall time                        = 393.350176
+  0: The maximum resident set size (KB)                   = 1196844
 
-Test 110 hafs_regional_docn_oisst PASS
+Test 108 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/hafs_regional_datm_cdeps
-Checking test 111 hafs_regional_datm_cdeps results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/hafs_regional_datm_cdeps
+Checking test 109 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-  0: The total amount of wall time                        = 945.046831
-  0: The maximum resident set size (KB)                   = 1014736
+  0: The total amount of wall time                        = 950.899133
+  0: The maximum resident set size (KB)                   = 1015232
 
-Test 111 hafs_regional_datm_cdeps PASS
+Test 109 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_control_cfsr
-Checking test 112 datm_cdeps_control_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_control_cfsr
+Checking test 110 datm_cdeps_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                        = 150.711133
- 0: The maximum resident set size (KB)                   = 1025524
+ 0: The total amount of wall time                        = 147.319763
+ 0: The maximum resident set size (KB)                   = 1026776
 
-Test 112 datm_cdeps_control_cfsr PASS
+Test 110 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_restart_cfsr
-Checking test 113 datm_cdeps_restart_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_restart_cfsr
+Checking test 111 datm_cdeps_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                        = 86.987702
- 0: The maximum resident set size (KB)                   = 995408
+ 0: The total amount of wall time                        = 87.436720
+ 0: The maximum resident set size (KB)                   = 989628
 
-Test 113 datm_cdeps_restart_cfsr PASS
+Test 111 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_control_gefs
-Checking test 114 datm_cdeps_control_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_control_gefs
+Checking test 112 datm_cdeps_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                        = 146.785381
- 0: The maximum resident set size (KB)                   = 938136
+ 0: The total amount of wall time                        = 143.239794
+ 0: The maximum resident set size (KB)                   = 932800
 
-Test 114 datm_cdeps_control_gefs PASS
+Test 112 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_iau_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_iau_gefs
-Checking test 115 datm_cdeps_iau_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_iau_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_iau_gefs
+Checking test 113 datm_cdeps_iau_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                        = 144.325047
- 0: The maximum resident set size (KB)                   = 935948
+ 0: The total amount of wall time                        = 143.863454
+ 0: The maximum resident set size (KB)                   = 931256
 
-Test 115 datm_cdeps_iau_gefs PASS
+Test 113 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_stochy_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_stochy_gefs
-Checking test 116 datm_cdeps_stochy_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_stochy_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_stochy_gefs
+Checking test 114 datm_cdeps_stochy_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                        = 145.705459
- 0: The maximum resident set size (KB)                   = 928660
+ 0: The total amount of wall time                        = 146.673381
+ 0: The maximum resident set size (KB)                   = 928488
 
-Test 116 datm_cdeps_stochy_gefs PASS
+Test 114 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_bulk_cfsr
-Checking test 117 datm_cdeps_bulk_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_bulk_cfsr
+Checking test 115 datm_cdeps_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                        = 148.610121
- 0: The maximum resident set size (KB)                   = 1034460
+ 0: The total amount of wall time                        = 147.705320
+ 0: The maximum resident set size (KB)                   = 1030632
 
-Test 117 datm_cdeps_bulk_cfsr PASS
+Test 115 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_bulk_gefs
-Checking test 118 datm_cdeps_bulk_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_bulk_gefs
+Checking test 116 datm_cdeps_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                        = 143.715451
- 0: The maximum resident set size (KB)                   = 938380
+ 0: The total amount of wall time                        = 144.194790
+ 0: The maximum resident set size (KB)                   = 942960
 
-Test 118 datm_cdeps_bulk_gefs PASS
+Test 116 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_mx025_cfsr
-Checking test 119 datm_cdeps_mx025_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_mx025_cfsr
+Checking test 117 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3121,15 +3010,15 @@ Checking test 119 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 302.541500
-  0: The maximum resident set size (KB)                   = 839700
+  0: The total amount of wall time                        = 304.932327
+  0: The maximum resident set size (KB)                   = 859104
 
-Test 119 datm_cdeps_mx025_cfsr PASS
+Test 117 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_gefs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_mx025_gefs
-Checking test 120 datm_cdeps_mx025_gefs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_gefs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_mx025_gefs
+Checking test 118 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3137,65 +3026,65 @@ Checking test 120 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 305.199329
-  0: The maximum resident set size (KB)                   = 852612
+  0: The total amount of wall time                        = 299.250505
+  0: The maximum resident set size (KB)                   = 858492
 
-Test 120 datm_cdeps_mx025_gefs PASS
+Test 118 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_multiple_files_cfsr
-Checking test 121 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_multiple_files_cfsr
+Checking test 119 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 144.782961
- 0: The maximum resident set size (KB)                   = 1024824
+ 0: The total amount of wall time                        = 148.159512
+ 0: The maximum resident set size (KB)                   = 1025184
 
-Test 121 datm_cdeps_multiple_files_cfsr PASS
+Test 119 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_3072x1536_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_3072x1536_cfsr
-Checking test 122 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_3072x1536_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_3072x1536_cfsr
+Checking test 120 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 192.510497
- 0: The maximum resident set size (KB)                   = 2177580
+ 0: The total amount of wall time                        = 197.723463
+ 0: The maximum resident set size (KB)                   = 2184040
 
-Test 122 datm_cdeps_3072x1536_cfsr PASS
+Test 120 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_gfs
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_gfs
-Checking test 123 datm_cdeps_gfs results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_gfs
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_gfs
+Checking test 121 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 201.459641
- 0: The maximum resident set size (KB)                   = 2249120
+ 0: The total amount of wall time                        = 204.187797
+ 0: The maximum resident set size (KB)                   = 2187088
 
-Test 123 datm_cdeps_gfs PASS
+Test 121 datm_cdeps_gfs PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_debug_cfsr
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/datm_cdeps_debug_cfsr
-Checking test 124 datm_cdeps_debug_cfsr results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_debug_cfsr
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/datm_cdeps_debug_cfsr
+Checking test 122 datm_cdeps_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                        = 437.292213
- 0: The maximum resident set size (KB)                   = 978380
+ 0: The total amount of wall time                        = 433.402381
+ 0: The maximum resident set size (KB)                   = 970472
 
-Test 124 datm_cdeps_debug_cfsr PASS
+Test 122 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atmwav
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_atmwav
-Checking test 125 control_atmwav results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atmwav
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_atmwav
+Checking test 123 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3238,15 +3127,15 @@ Checking test 125 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 81.058519
-  0: The maximum resident set size (KB)                   = 672360
+  0: The total amount of wall time                        = 79.343626
+  0: The maximum resident set size (KB)                   = 668388
 
-Test 125 control_atmwav PASS
+Test 123 control_atmwav PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atm_aerosols
-working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_17989/control_atm_aerosols
-Checking test 126 control_atm_aerosols results ....
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atm_aerosols
+working dir  = /scratch1/NCEPDEV/stmp2/emc.nemspara/FV3_RT/rt_8374/control_atm_aerosols
+Checking test 124 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3289,12 +3178,12 @@ Checking test 126 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 344.363828
-  0: The maximum resident set size (KB)                   = 4801752
+  0: The total amount of wall time                        = 343.211996
+  0: The maximum resident set size (KB)                   = 4799248
 
-Test 126 control_atm_aerosols PASS
+Test 124 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 17:07:32 UTC 2022
-Elapsed time: 01h:52m:50s. Have a nice day!
+Sun May 29 22:46:13 UTC 2022
+Elapsed time: 01h:02m:28s. Have a nice day!
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
index 1a098ef319..ec70060407 100644
--- a/tests/RegressionTests_jet.intel.log
+++ b/tests/RegressionTests_jet.intel.log
@@ -1,25 +1,25 @@
-Fri May 27 13:16:49 GMT 2022
+Mon May 30 13:01:51 GMT 2022
 Start Regression test
 
-Compile 001 elapsed time 2070 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON -DMOM6SOLO=ON
-Compile 002 elapsed time 277 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 1408 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 004 elapsed time 1449 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 005 elapsed time 1440 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 006 elapsed time 1244 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 007 elapsed time 282 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 264 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 264 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 274 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 1613 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 012 elapsed time 1658 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 013 elapsed time 328 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON -DMOM6SOLO=ON
+Compile 001 elapsed time 1707 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON -DMOM6SOLO=ON
+Compile 002 elapsed time 261 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 1369 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 004 elapsed time 1439 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 005 elapsed time 1414 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 006 elapsed time 1230 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 007 elapsed time 257 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 201 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 233 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 010 elapsed time 226 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 1608 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 012 elapsed time 1602 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 013 elapsed time 285 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON -DMOM6SOLO=ON
 Compile 014 elapsed time 144 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 1593 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-Compile 016 elapsed time 1366 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 015 elapsed time 1581 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
+Compile 016 elapsed time 1322 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_control_p8
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 578.079608
-  0: The maximum resident set size (KB)                   = 2011944
+  0: The total amount of wall time                        = 523.097380
+  0: The maximum resident set size (KB)                   = 2021604
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,67 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.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.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
  Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-  0: The total amount of wall time                        = 1057.263890
-  0: The maximum resident set size (KB)                   = 2585480
-
-Test 002 cpld_2threads_p8 PASS
-
-
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_mpi_p8
-Checking test 003 cpld_mpi_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,32 +141,18 @@ Checking test 003 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 485.076908
-  0: The maximum resident set size (KB)                   = 1859832
+  0: The total amount of wall time                        = 320.374666
+  0: The maximum resident set size (KB)                   = 1985300
 
-Test 003 cpld_mpi_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_control_c96_p8
-Checking test 004 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -276,16 +201,18 @@ Checking test 004 cpld_control_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 472.767017
-  0: The maximum resident set size (KB)                   = 1881816
+  0: The total amount of wall time                        = 1021.427784
+  0: The maximum resident set size (KB)                   = 2603176
 
-Test 004 cpld_control_c96_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_restart_c96_p8
-Checking test 005 cpld_restart_c96_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/cpld_mpi_p8
+Checking test 004 cpld_mpi_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -334,29 +261,31 @@ Checking test 005 cpld_restart_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-  0: The total amount of wall time                        = 272.551985
-  0: The maximum resident set size (KB)                   = 1805264
-
-Test 005 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_debug_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/cpld_debug_p8
-Checking test 006 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 439.679289
+  0: The maximum resident set size (KB)                   = 1858364
+
+Test 004 cpld_mpi_p8 PASS
+
+
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_debug_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/cpld_debug_p8
+Checking test 005 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -390,18 +319,20 @@ Checking test 006 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1224.618497
-  0: The maximum resident set size (KB)                   = 1914300
+  0: The total amount of wall time                        = 985.106095
+  0: The maximum resident set size (KB)                   = 2073916
 
-Test 006 cpld_debug_p8 PASS
+Test 005 cpld_debug_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control
-Checking test 007 control results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control
+Checking test 006 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -447,15 +378,15 @@ Checking test 007 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 195.320426
-  0: The maximum resident set size (KB)                   = 581024
+  0: The total amount of wall time                        = 172.114557
+  0: The maximum resident set size (KB)                   = 580776
 
-Test 007 control PASS
+Test 006 control PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_decomp
-Checking test 008 control_decomp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_decomp
+Checking test 007 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -497,29 +428,29 @@ Checking test 008 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 194.870171
-  0: The maximum resident set size (KB)                   = 574280
+  0: The total amount of wall time                        = 175.670083
+  0: The maximum resident set size (KB)                   = 577752
 
-Test 008 control_decomp PASS
+Test 007 control_decomp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_2dwrtdecomp
-Checking test 009 control_2dwrtdecomp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_2dwrtdecomp
+Checking test 008 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 175.956449
-  0: The maximum resident set size (KB)                   = 586904
+  0: The total amount of wall time                        = 163.374747
+  0: The maximum resident set size (KB)                   = 579700
 
-Test 009 control_2dwrtdecomp PASS
+Test 008 control_2dwrtdecomp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_2threads
-Checking test 010 control_2threads results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_2threads
+Checking test 009 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -561,15 +492,15 @@ Checking test 010 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 481.298461
- 0: The maximum resident set size (KB)                   = 646160
+ 0: The total amount of wall time                        = 397.858724
+ 0: The maximum resident set size (KB)                   = 640280
 
-Test 010 control_2threads PASS
+Test 009 control_2threads PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_restart
-Checking test 011 control_restart results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_restart
+Checking test 010 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -607,15 +538,15 @@ Checking test 011 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 101.326950
-  0: The maximum resident set size (KB)                   = 369788
+  0: The total amount of wall time                        = 92.135851
+  0: The maximum resident set size (KB)                   = 367812
 
-Test 011 control_restart PASS
+Test 010 control_restart PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_fhzero
-Checking test 012 control_fhzero results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_fhzero
+Checking test 011 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -657,15 +588,15 @@ Checking test 012 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 174.597774
-  0: The maximum resident set size (KB)                   = 580776
+  0: The total amount of wall time                        = 161.921669
+  0: The maximum resident set size (KB)                   = 585068
 
-Test 012 control_fhzero PASS
+Test 011 control_fhzero PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_CubedSphereGrid
-Checking test 013 control_CubedSphereGrid results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_CubedSphereGrid
+Checking test 012 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -691,15 +622,15 @@ Checking test 013 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 171.665558
-  0: The maximum resident set size (KB)                   = 581752
+  0: The total amount of wall time                        = 166.240030
+  0: The maximum resident set size (KB)                   = 588392
 
-Test 013 control_CubedSphereGrid PASS
+Test 012 control_CubedSphereGrid PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_latlon
-Checking test 014 control_latlon results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_latlon
+Checking test 013 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -709,15 +640,15 @@ Checking test 014 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 188.477412
-  0: The maximum resident set size (KB)                   = 583324
+  0: The total amount of wall time                        = 166.646941
+  0: The maximum resident set size (KB)                   = 579960
 
-Test 014 control_latlon PASS
+Test 013 control_latlon PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_wrtGauss_netcdf_parallel
-Checking test 015 control_wrtGauss_netcdf_parallel results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_wrtGauss_netcdf_parallel
+Checking test 014 control_wrtGauss_netcdf_parallel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -727,15 +658,15 @@ Checking test 015 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 196.972894
-  0: The maximum resident set size (KB)                   = 580188
+  0: The total amount of wall time                        = 171.732735
+  0: The maximum resident set size (KB)                   = 578148
 
-Test 015 control_wrtGauss_netcdf_parallel PASS
+Test 014 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_c48
-Checking test 016 control_c48 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_c48
+Checking test 015 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -773,15 +704,15 @@ Checking test 016 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 572.292471
-0: The maximum resident set size (KB)                   = 785952
+0: The total amount of wall time                        = 564.946087
+0: The maximum resident set size (KB)                   = 788832
 
-Test 016 control_c48 PASS
+Test 015 control_c48 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_c192
-Checking test 017 control_c192 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_c192
+Checking test 016 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -791,15 +722,15 @@ Checking test 017 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 720.516127
-  0: The maximum resident set size (KB)                   = 732004
+  0: The total amount of wall time                        = 676.051344
+  0: The maximum resident set size (KB)                   = 734304
 
-Test 017 control_c192 PASS
+Test 016 control_c192 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_c384
-Checking test 018 control_c384 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_c384
+Checking test 017 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -809,15 +740,15 @@ Checking test 018 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 938.029239
-  0: The maximum resident set size (KB)                   = 1071884
+  0: The total amount of wall time                        = 870.358200
+  0: The maximum resident set size (KB)                   = 1068636
 
-Test 018 control_c384 PASS
+Test 017 control_c384 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_c384gdas
-Checking test 019 control_c384gdas results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_c384gdas
+Checking test 018 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -859,15 +790,15 @@ Checking test 019 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 1020.721621
-  0: The maximum resident set size (KB)                   = 1159404
+  0: The total amount of wall time                        = 804.061150
+  0: The maximum resident set size (KB)                   = 1157636
 
-Test 019 control_c384gdas PASS
+Test 018 control_c384gdas PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_stochy
-Checking test 020 control_stochy results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_stochy
+Checking test 019 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -877,29 +808,29 @@ Checking test 020 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 123.915333
-  0: The maximum resident set size (KB)                   = 585740
+  0: The total amount of wall time                        = 112.234915
+  0: The maximum resident set size (KB)                   = 587340
 
-Test 020 control_stochy PASS
+Test 019 control_stochy PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_stochy_restart
-Checking test 021 control_stochy_restart results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_stochy_restart
+Checking test 020 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 116.761643
-  0: The maximum resident set size (KB)                   = 390732
+  0: The total amount of wall time                        = 61.845590
+  0: The maximum resident set size (KB)                   = 393028
 
-Test 021 control_stochy_restart PASS
+Test 020 control_stochy_restart PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_lndp
-Checking test 022 control_lndp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_lndp
+Checking test 021 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -909,15 +840,15 @@ Checking test 022 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 104.906028
-  0: The maximum resident set size (KB)                   = 585156
+  0: The total amount of wall time                        = 100.391007
+  0: The maximum resident set size (KB)                   = 583816
 
-Test 022 control_lndp PASS
+Test 021 control_lndp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_iovr4
-Checking test 023 control_iovr4 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_iovr4
+Checking test 022 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -931,15 +862,15 @@ Checking test 023 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 197.503300
-  0: The maximum resident set size (KB)                   = 584292
+  0: The total amount of wall time                        = 173.910275
+  0: The maximum resident set size (KB)                   = 579988
 
-Test 023 control_iovr4 PASS
+Test 022 control_iovr4 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_iovr5
-Checking test 024 control_iovr5 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_iovr5
+Checking test 023 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -953,15 +884,15 @@ Checking test 024 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 255.040220
-  0: The maximum resident set size (KB)                   = 588412
+  0: The total amount of wall time                        = 172.746744
+  0: The maximum resident set size (KB)                   = 581216
 
-Test 024 control_iovr5 PASS
+Test 023 control_iovr5 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_p8
-Checking test 025 control_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_p8
+Checking test 024 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1007,15 +938,15 @@ Checking test 025 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 325.470807
-  0: The maximum resident set size (KB)                   = 973972
+  0: The total amount of wall time                        = 227.715822
+  0: The maximum resident set size (KB)                   = 977336
 
-Test 025 control_p8 PASS
+Test 024 control_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_p8_lndp
-Checking test 026 control_p8_lndp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_p8_lndp
+Checking test 025 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1033,15 +964,15 @@ Checking test 026 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-  0: The total amount of wall time                        = 483.229147
-  0: The maximum resident set size (KB)                   = 975272
+  0: The total amount of wall time                        = 430.423803
+  0: The maximum resident set size (KB)                   = 975760
 
-Test 026 control_p8_lndp PASS
+Test 025 control_p8_lndp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_restart_p8
-Checking test 027 control_restart_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_restart_p8
+Checking test 026 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1079,15 +1010,15 @@ Checking test 027 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 123.668629
-  0: The maximum resident set size (KB)                   = 773308
+  0: The total amount of wall time                        = 121.673452
+  0: The maximum resident set size (KB)                   = 770432
 
-Test 027 control_restart_p8 PASS
+Test 026 control_restart_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_decomp_p8
-Checking test 028 control_decomp_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_decomp_p8
+Checking test 027 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1129,15 +1060,15 @@ Checking test 028 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 259.659522
-  0: The maximum resident set size (KB)                   = 962572
+  0: The total amount of wall time                        = 230.315285
+  0: The maximum resident set size (KB)                   = 962436
 
-Test 028 control_decomp_p8 PASS
+Test 027 control_decomp_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_2threads_p8
-Checking test 029 control_2threads_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_2threads_p8
+Checking test 028 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1179,15 +1110,15 @@ Checking test 029 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 556.261407
- 0: The maximum resident set size (KB)                   = 1053028
+ 0: The total amount of wall time                        = 534.054257
+ 0: The maximum resident set size (KB)                   = 1056532
 
-Test 029 control_2threads_p8 PASS
+Test 028 control_2threads_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_p8_rrtmgp
-Checking test 030 control_p8_rrtmgp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_p8_rrtmgp
+Checking test 029 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1233,15 +1164,15 @@ Checking test 030 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 310.513820
-  0: The maximum resident set size (KB)                   = 1096992
+  0: The total amount of wall time                        = 263.090258
+  0: The maximum resident set size (KB)                   = 1100536
 
-Test 030 control_p8_rrtmgp PASS
+Test 029 control_p8_rrtmgp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_control
-Checking test 031 regional_control results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_control
+Checking test 030 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1251,72 +1182,72 @@ Checking test 031 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 491.954023
- 0: The maximum resident set size (KB)                   = 746656
+ 0: The total amount of wall time                        = 456.161097
+ 0: The maximum resident set size (KB)                   = 742492
 
-Test 031 regional_control PASS
+Test 030 regional_control PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_restart
-Checking test 032 regional_restart results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_restart
+Checking test 031 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 271.571605
- 0: The maximum resident set size (KB)                   = 737576
+ 0: The total amount of wall time                        = 251.244384
+ 0: The maximum resident set size (KB)                   = 730660
 
-Test 032 regional_restart PASS
+Test 031 regional_restart PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_control_2dwrtdecomp
-Checking test 033 regional_control_2dwrtdecomp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_control_2dwrtdecomp
+Checking test 032 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 487.257421
- 0: The maximum resident set size (KB)                   = 740916
+ 0: The total amount of wall time                        = 449.555316
+ 0: The maximum resident set size (KB)                   = 745292
 
-Test 033 regional_control_2dwrtdecomp PASS
+Test 032 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_noquilt
-Checking test 034 regional_noquilt results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_noquilt
+Checking test 033 regional_noquilt 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                        = 509.388516
- 0: The maximum resident set size (KB)                   = 716760
+ 0: The total amount of wall time                        = 479.511037
+ 0: The maximum resident set size (KB)                   = 718768
 
-Test 034 regional_noquilt PASS
+Test 033 regional_noquilt PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_netcdf_parallel
-Checking test 035 regional_netcdf_parallel results ....
- Comparing dynf000.nc .........OK
- Comparing dynf024.nc .........OK
- Comparing phyf000.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_netcdf_parallel
+Checking test 034 regional_netcdf_parallel results ....
+ Comparing dynf000.nc ............ALT CHECK......OK
+ Comparing dynf024.nc ............ALT CHECK......OK
+ Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 487.691533
- 0: The maximum resident set size (KB)                   = 741636
+ 0: The total amount of wall time                        = 451.334582
+ 0: The maximum resident set size (KB)                   = 731888
 
-Test 035 regional_netcdf_parallel PASS
+Test 034 regional_netcdf_parallel PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_3km
-Checking test 036 regional_3km results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_3km
+Checking test 035 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1326,15 +1257,15 @@ Checking test 036 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 427.832450
-  0: The maximum resident set size (KB)                   = 779724
+  0: The total amount of wall time                        = 342.163705
+  0: The maximum resident set size (KB)                   = 783108
 
-Test 036 regional_3km PASS
+Test 035 regional_3km PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_control
-Checking test 037 rap_control results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_control
+Checking test 036 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1380,15 +1311,15 @@ Checking test 037 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 635.273297
-  0: The maximum resident set size (KB)                   = 962824
+  0: The total amount of wall time                        = 567.697324
+  0: The maximum resident set size (KB)                   = 962524
 
-Test 037 rap_control PASS
+Test 036 rap_control PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_rrtmgp
-Checking test 038 rap_rrtmgp results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_rrtmgp
+Checking test 037 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1434,15 +1365,15 @@ Checking test 038 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 729.114517
-  0: The maximum resident set size (KB)                   = 1094804
+  0: The total amount of wall time                        = 604.812484
+  0: The maximum resident set size (KB)                   = 1093928
 
-Test 038 rap_rrtmgp PASS
+Test 037 rap_rrtmgp PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_spp_sppt_shum_skeb
-Checking test 039 regional_spp_sppt_shum_skeb results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_spp_sppt_shum_skeb
+Checking test 038 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1452,15 +1383,15 @@ Checking test 039 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 1133.419879
-  0: The maximum resident set size (KB)                   = 1117564
+  0: The total amount of wall time                        = 834.256622
+  0: The maximum resident set size (KB)                   = 1098136
 
-Test 039 regional_spp_sppt_shum_skeb PASS
+Test 038 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_restart
-Checking test 040 rap_restart results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_restart
+Checking test 039 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1498,15 +1429,15 @@ Checking test 040 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 328.059905
-  0: The maximum resident set size (KB)                   = 809080
+  0: The total amount of wall time                        = 291.715649
+  0: The maximum resident set size (KB)                   = 813468
 
-Test 040 rap_restart PASS
+Test 039 rap_restart PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_sfcdiff
-Checking test 041 rap_sfcdiff results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_sfcdiff
+Checking test 040 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1552,15 +1483,15 @@ Checking test 041 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 627.968350
-  0: The maximum resident set size (KB)                   = 964168
+  0: The total amount of wall time                        = 574.436848
+  0: The maximum resident set size (KB)                   = 974024
 
-Test 041 rap_sfcdiff PASS
+Test 040 rap_sfcdiff PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_sfcdiff_restart
-Checking test 042 rap_sfcdiff_restart results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_sfcdiff_restart
+Checking test 041 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1598,15 +1529,15 @@ Checking test 042 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 294.349914
-  0: The maximum resident set size (KB)                   = 813892
+  0: The total amount of wall time                        = 291.581553
+  0: The maximum resident set size (KB)                   = 813852
 
-Test 042 rap_sfcdiff_restart PASS
+Test 041 rap_sfcdiff_restart PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hrrr_control
-Checking test 043 hrrr_control results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hrrr_control
+Checking test 042 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1652,15 +1583,15 @@ Checking test 043 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 596.133405
-  0: The maximum resident set size (KB)                   = 964080
+  0: The total amount of wall time                        = 545.859892
+  0: The maximum resident set size (KB)                   = 968060
 
-Test 043 hrrr_control PASS
+Test 042 hrrr_control PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_v1beta
-Checking test 044 rrfs_v1beta results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_v1beta
+Checking test 043 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1706,15 +1637,15 @@ Checking test 044 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 601.540890
-  0: The maximum resident set size (KB)                   = 962044
+  0: The total amount of wall time                        = 559.298781
+  0: The maximum resident set size (KB)                   = 958820
 
-Test 044 rrfs_v1beta PASS
+Test 043 rrfs_v1beta PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_v1nssl
-Checking test 045 rrfs_v1nssl results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_v1nssl
+Checking test 044 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1728,15 +1659,15 @@ Checking test 045 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 710.798260
-  0: The maximum resident set size (KB)                   = 641300
+  0: The total amount of wall time                        = 660.274326
+  0: The maximum resident set size (KB)                   = 645560
 
-Test 045 rrfs_v1nssl PASS
+Test 044 rrfs_v1nssl PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_v1nssl_nohailnoccn
-Checking test 046 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_v1nssl_nohailnoccn
+Checking test 045 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1750,15 +1681,15 @@ Checking test 046 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 700.227625
-  0: The maximum resident set size (KB)                   = 647040
+  0: The total amount of wall time                        = 654.193914
+  0: The maximum resident set size (KB)                   = 645244
 
-Test 046 rrfs_v1nssl_nohailnoccn PASS
+Test 045 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_conus13km_hrrr_warm
-Checking test 047 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_conus13km_hrrr_warm
+Checking test 046 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -1766,15 +1697,15 @@ Checking test 047 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 260.170949
-  0: The maximum resident set size (KB)                   = 848744
+  0: The total amount of wall time                        = 238.294611
+  0: The maximum resident set size (KB)                   = 849480
 
-Test 047 rrfs_conus13km_hrrr_warm PASS
+Test 046 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_conus13km_radar_tten_warm
-Checking test 048 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_conus13km_radar_tten_warm
+Checking test 047 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -1782,15 +1713,15 @@ Checking test 048 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 256.475125
-  0: The maximum resident set size (KB)                   = 855212
+  0: The total amount of wall time                        = 238.696929
+  0: The maximum resident set size (KB)                   = 850388
 
-Test 048 rrfs_conus13km_radar_tten_warm PASS
+Test 047 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_smoke_conus13km_hrrr_warm
-Checking test 049 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_smoke_conus13km_hrrr_warm
+Checking test 048 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -1798,15 +1729,15 @@ Checking test 049 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 285.703295
-  0: The maximum resident set size (KB)                   = 880164
+  0: The total amount of wall time                        = 265.028874
+  0: The maximum resident set size (KB)                   = 881120
 
-Test 049 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 048 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_csawmg
-Checking test 050 control_csawmg results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_csawmg
+Checking test 049 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1816,15 +1747,15 @@ Checking test 050 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 469.485879
-  0: The maximum resident set size (KB)                   = 690628
+  0: The total amount of wall time                        = 435.394807
+  0: The maximum resident set size (KB)                   = 690096
 
-Test 050 control_csawmg PASS
+Test 049 control_csawmg PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_csawmgt
-Checking test 051 control_csawmgt results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_csawmgt
+Checking test 050 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1834,15 +1765,15 @@ Checking test 051 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 434.918436
-  0: The maximum resident set size (KB)                   = 688944
+  0: The total amount of wall time                        = 429.174339
+  0: The maximum resident set size (KB)                   = 685656
 
-Test 051 control_csawmgt PASS
+Test 050 control_csawmgt PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_flake
-Checking test 052 control_flake results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_flake
+Checking test 051 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1852,15 +1783,15 @@ Checking test 052 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 287.815346
-  0: The maximum resident set size (KB)                   = 693156
+  0: The total amount of wall time                        = 274.714146
+  0: The maximum resident set size (KB)                   = 695732
 
-Test 052 control_flake PASS
+Test 051 control_flake PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_ras
-Checking test 053 control_ras results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_ras
+Checking test 052 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1870,15 +1801,15 @@ Checking test 053 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 239.636029
-  0: The maximum resident set size (KB)                   = 661388
+  0: The total amount of wall time                        = 230.240419
+  0: The maximum resident set size (KB)                   = 654164
 
-Test 053 control_ras PASS
+Test 052 control_ras PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson
-Checking test 054 control_thompson results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson
+Checking test 053 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1888,15 +1819,15 @@ Checking test 054 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 322.598126
-  0: The maximum resident set size (KB)                   = 1016720
+  0: The total amount of wall time                        = 312.889981
+  0: The maximum resident set size (KB)                   = 1007364
 
-Test 054 control_thompson PASS
+Test 053 control_thompson PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson_no_aero
-Checking test 055 control_thompson_no_aero results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson_no_aero
+Checking test 054 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1906,55 +1837,55 @@ Checking test 055 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 314.500196
-  0: The maximum resident set size (KB)                   = 998060
+  0: The total amount of wall time                        = 297.584906
+  0: The maximum resident set size (KB)                   = 997000
 
-Test 055 control_thompson_no_aero PASS
+Test 054 control_thompson_no_aero PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_wam
-Checking test 056 control_wam results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_wam
+Checking test 055 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 146.516194
-  0: The maximum resident set size (KB)                   = 453688
+  0: The total amount of wall time                        = 135.091322
+  0: The maximum resident set size (KB)                   = 460716
 
-Test 056 control_wam PASS
+Test 055 control_wam PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_debug
-Checking test 057 control_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_debug
+Checking test 056 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 190.507116
-  0: The maximum resident set size (KB)                   = 746968
+  0: The total amount of wall time                        = 186.879256
+  0: The maximum resident set size (KB)                   = 743660
 
-Test 057 control_debug PASS
+Test 056 control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_2threads_debug
-Checking test 058 control_2threads_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_2threads_debug
+Checking test 057 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
- 0: The total amount of wall time                        = 343.748735
- 0: The maximum resident set size (KB)                   = 802876
+ 0: The total amount of wall time                        = 338.644861
+ 0: The maximum resident set size (KB)                   = 806856
 
-Test 058 control_2threads_debug PASS
+Test 057 control_2threads_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_CubedSphereGrid_debug
-Checking test 059 control_CubedSphereGrid_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_CubedSphereGrid_debug
+Checking test 058 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -1980,586 +1911,600 @@ Checking test 059 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 208.371905
-  0: The maximum resident set size (KB)                   = 742948
+  0: The total amount of wall time                        = 206.475232
+  0: The maximum resident set size (KB)                   = 744080
 
-Test 059 control_CubedSphereGrid_debug PASS
+Test 058 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_wrtGauss_netcdf_parallel_debug
-Checking test 060 control_wrtGauss_netcdf_parallel_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_wrtGauss_netcdf_parallel_debug
+Checking test 059 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 221.123752
-  0: The maximum resident set size (KB)                   = 743308
+  0: The total amount of wall time                        = 190.922245
+  0: The maximum resident set size (KB)                   = 746340
 
-Test 060 control_wrtGauss_netcdf_parallel_debug PASS
+Test 059 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_stochy_debug
-Checking test 061 control_stochy_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_stochy_debug
+Checking test 060 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 225.902291
-  0: The maximum resident set size (KB)                   = 753244
+  0: The total amount of wall time                        = 216.661589
+  0: The maximum resident set size (KB)                   = 751048
 
-Test 061 control_stochy_debug PASS
+Test 060 control_stochy_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_lndp_debug
-Checking test 062 control_lndp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_lndp_debug
+Checking test 061 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 230.864896
-  0: The maximum resident set size (KB)                   = 750228
+  0: The total amount of wall time                        = 194.694115
+  0: The maximum resident set size (KB)                   = 754104
 
-Test 062 control_lndp_debug PASS Tries: 2
+Test 061 control_lndp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_csawmg_debug
-Checking test 063 control_csawmg_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_csawmg_debug
+Checking test 062 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 308.573974
-  0: The maximum resident set size (KB)                   = 793044
+  0: The total amount of wall time                        = 302.763495
+  0: The maximum resident set size (KB)                   = 798760
 
-Test 063 control_csawmg_debug PASS
+Test 062 control_csawmg_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_csawmgt_debug
-Checking test 064 control_csawmgt_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_csawmgt_debug
+Checking test 063 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 308.049431
-  0: The maximum resident set size (KB)                   = 792488
+  0: The total amount of wall time                        = 298.367082
+  0: The maximum resident set size (KB)                   = 796960
 
-Test 064 control_csawmgt_debug PASS Tries: 2
+Test 063 control_csawmgt_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_ras_debug
-Checking test 065 control_ras_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_ras_debug
+Checking test 064 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 203.812388
-  0: The maximum resident set size (KB)                   = 757628
+  0: The total amount of wall time                        = 196.205371
+  0: The maximum resident set size (KB)                   = 760096
 
-Test 065 control_ras_debug PASS
+Test 064 control_ras_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_diag_debug
-Checking test 066 control_diag_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_diag_debug
+Checking test 065 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 206.924965
-  0: The maximum resident set size (KB)                   = 800724
+  0: The total amount of wall time                        = 202.514939
+  0: The maximum resident set size (KB)                   = 802136
 
-Test 066 control_diag_debug PASS
+Test 065 control_diag_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_debug_p8
-Checking test 067 control_debug_p8 results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_debug_p8
+Checking test 066 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 218.805796
-  0: The maximum resident set size (KB)                   = 1132548
+  0: The total amount of wall time                        = 214.402498
+  0: The maximum resident set size (KB)                   = 1137856
 
-Test 067 control_debug_p8 PASS
+Test 066 control_debug_p8 PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson_debug
-Checking test 068 control_thompson_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson_debug
+Checking test 067 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 228.359799
-  0: The maximum resident set size (KB)                   = 1115440
+  0: The total amount of wall time                        = 226.384216
+  0: The maximum resident set size (KB)                   = 1113868
 
-Test 068 control_thompson_debug PASS
+Test 067 control_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson_no_aero_debug
-Checking test 069 control_thompson_no_aero_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson_no_aero_debug
+Checking test 068 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 222.431643
-  0: The maximum resident set size (KB)                   = 1102412
+  0: The total amount of wall time                        = 217.609038
+  0: The maximum resident set size (KB)                   = 1106972
 
-Test 069 control_thompson_no_aero_debug PASS
+Test 068 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson_extdiag_debug
-Checking test 070 control_thompson_extdiag_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson_extdiag_debug
+Checking test 069 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 244.562361
-  0: The maximum resident set size (KB)                   = 1141848
+  0: The total amount of wall time                        = 236.495668
+  0: The maximum resident set size (KB)                   = 1143772
 
-Test 070 control_thompson_extdiag_debug PASS
+Test 069 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_thompson_progcld_thompson_debug
-Checking test 071 control_thompson_progcld_thompson_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_thompson_progcld_thompson_debug
+Checking test 070 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 230.647264
-  0: The maximum resident set size (KB)                   = 1116580
+  0: The total amount of wall time                        = 224.341259
+  0: The maximum resident set size (KB)                   = 1116768
 
-Test 071 control_thompson_progcld_thompson_debug PASS
+Test 070 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/regional_debug
-Checking test 072 regional_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/regional_debug
+Checking test 071 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
- 0: The total amount of wall time                        = 323.009044
- 0: The maximum resident set size (KB)                   = 769196
+ 0: The total amount of wall time                        = 323.176915
+ 0: The maximum resident set size (KB)                   = 759432
 
-Test 072 regional_debug PASS
+Test 071 regional_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_control_debug
-Checking test 073 rap_control_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_control_debug
+Checking test 072 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 353.913184
-  0: The maximum resident set size (KB)                   = 1124108
+  0: The total amount of wall time                        = 349.193384
+  0: The maximum resident set size (KB)                   = 1123336
 
-Test 073 rap_control_debug PASS
+Test 072 rap_control_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_unified_drag_suite_debug
-Checking test 074 rap_unified_drag_suite_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_unified_drag_suite_debug
+Checking test 073 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 354.746169
-  0: The maximum resident set size (KB)                   = 1124928
+  0: The total amount of wall time                        = 349.631069
+  0: The maximum resident set size (KB)                   = 1123136
 
-Test 074 rap_unified_drag_suite_debug PASS
+Test 073 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_diag_debug
-Checking test 075 rap_diag_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_diag_debug
+Checking test 074 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 368.333203
-  0: The maximum resident set size (KB)                   = 1204476
+  0: The total amount of wall time                        = 367.700892
+  0: The maximum resident set size (KB)                   = 1209956
 
-Test 075 rap_diag_debug PASS
+Test 074 rap_diag_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_cires_ugwp_debug
-Checking test 076 rap_cires_ugwp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_cires_ugwp_debug
+Checking test 075 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 356.306684
-  0: The maximum resident set size (KB)                   = 1125088
+  0: The total amount of wall time                        = 352.811548
+  0: The maximum resident set size (KB)                   = 1128984
 
-Test 076 rap_cires_ugwp_debug PASS
+Test 075 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_unified_ugwp_debug
-Checking test 077 rap_unified_ugwp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_unified_ugwp_debug
+Checking test 076 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 358.976160
-  0: The maximum resident set size (KB)                   = 1124808
+  0: The total amount of wall time                        = 352.002901
+  0: The maximum resident set size (KB)                   = 1124948
 
-Test 077 rap_unified_ugwp_debug PASS
+Test 076 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_lndp_debug
-Checking test 078 rap_lndp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_lndp_debug
+Checking test 077 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 350.265509
-  0: The maximum resident set size (KB)                   = 1127428
+  0: The total amount of wall time                        = 355.198752
+  0: The maximum resident set size (KB)                   = 1129292
 
-Test 078 rap_lndp_debug PASS
+Test 077 rap_lndp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_flake_debug
-Checking test 079 rap_flake_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_flake_debug
+Checking test 078 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 350.366451
-  0: The maximum resident set size (KB)                   = 1126744
+  0: The total amount of wall time                        = 347.077209
+  0: The maximum resident set size (KB)                   = 1125020
 
-Test 079 rap_flake_debug PASS
+Test 078 rap_flake_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_progcld_thompson_debug
-Checking test 080 rap_progcld_thompson_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_progcld_thompson_debug
+Checking test 079 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 347.479363
-  0: The maximum resident set size (KB)                   = 1124460
+  0: The total amount of wall time                        = 351.652164
+  0: The maximum resident set size (KB)                   = 1123512
 
-Test 080 rap_progcld_thompson_debug PASS
+Test 079 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_noah_debug
-Checking test 081 rap_noah_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_noah_debug
+Checking test 080 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 348.217132
-  0: The maximum resident set size (KB)                   = 1124264
+  0: The total amount of wall time                        = 344.291755
+  0: The maximum resident set size (KB)                   = 1126888
 
-Test 081 rap_noah_debug PASS
+Test 080 rap_noah_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_rrtmgp_debug
-Checking test 082 rap_rrtmgp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_rrtmgp_debug
+Checking test 081 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 587.513418
-  0: The maximum resident set size (KB)                   = 1252780
+  0: The total amount of wall time                        = 583.449278
+  0: The maximum resident set size (KB)                   = 1250388
 
-Test 082 rap_rrtmgp_debug PASS
+Test 081 rap_rrtmgp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_sfcdiff_debug
-Checking test 083 rap_sfcdiff_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_sfcdiff_debug
+Checking test 082 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 350.809113
-  0: The maximum resident set size (KB)                   = 1125948
+  0: The total amount of wall time                        = 348.444466
+  0: The maximum resident set size (KB)                   = 1126548
 
-Test 083 rap_sfcdiff_debug PASS
+Test 082 rap_sfcdiff_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 084 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 083 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 588.435165
-  0: The maximum resident set size (KB)                   = 1122856
+  0: The total amount of wall time                        = 574.527613
+  0: The maximum resident set size (KB)                   = 1127016
 
-Test 084 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 083 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/rrfs_v1beta_debug
-Checking test 085 rrfs_v1beta_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/rrfs_v1beta_debug
+Checking test 084 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 350.072878
-  0: The maximum resident set size (KB)                   = 1126044
+  0: The total amount of wall time                        = 465.268215
+  0: The maximum resident set size (KB)                   = 1123268
 
-Test 085 rrfs_v1beta_debug PASS
+Test 084 rrfs_v1beta_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_wam_debug
-Checking test 086 control_wam_debug results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_wam_debug
+Checking test 085 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 370.105945
-  0: The maximum resident set size (KB)                   = 430920
+  0: The total amount of wall time                        = 362.697345
+  0: The maximum resident set size (KB)                   = 435840
 
-Test 086 control_wam_debug PASS
+Test 085 control_wam_debug PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_atm
-Checking test 087 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_atm
+Checking test 086 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 734.448791
-  0: The maximum resident set size (KB)                   = 1173076
+  0: The total amount of wall time                        = 717.114373
+  0: The maximum resident set size (KB)                   = 1171276
+
+Test 086 hafs_regional_atm PASS
+
+
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_atm_thompson_gfdlsf
+Checking test 087 hafs_regional_atm_thompson_gfdlsf results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
 
-Test 087 hafs_regional_atm PASS
+  0: The total amount of wall time                        = 826.037055
+  0: The maximum resident set size (KB)                   = 1540576
 
-Test 088 hafs_regional_atm_thompson_gfdlsf FAIL
+Test 087 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_atm_ocn
-Checking test 089 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_atm_ocn
+Checking test 088 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 574.256459
-  0: The maximum resident set size (KB)                   = 1271584
+  0: The total amount of wall time                        = 505.433303
+  0: The maximum resident set size (KB)                   = 1266960
 
-Test 089 hafs_regional_atm_ocn PASS
+Test 088 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_atm_wav
-Checking test 090 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_atm_wav
+Checking test 089 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 943.258748
-  0: The maximum resident set size (KB)                   = 1271172
+  0: The total amount of wall time                        = 895.135032
+  0: The maximum resident set size (KB)                   = 1297264
 
-Test 090 hafs_regional_atm_wav PASS
+Test 089 hafs_regional_atm_wav PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_atm_ocn_wav
-Checking test 091 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_atm_ocn_wav
+Checking test 090 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 1100.121385
-  0: The maximum resident set size (KB)                   = 1272116
+  0: The total amount of wall time                        = 999.218033
+  0: The maximum resident set size (KB)                   = 1330816
 
-Test 091 hafs_regional_atm_ocn_wav PASS
+Test 090 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_docn
-Checking test 092 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_docn
+Checking test 091 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 544.989899
-  0: The maximum resident set size (KB)                   = 1285612
+  0: The total amount of wall time                        = 505.755674
+  0: The maximum resident set size (KB)                   = 1277244
 
-Test 092 hafs_regional_docn PASS
+Test 091 hafs_regional_docn PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_docn_oisst
-Checking test 093 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_docn_oisst
+Checking test 092 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 544.677956
-  0: The maximum resident set size (KB)                   = 1274204
+  0: The total amount of wall time                        = 509.176855
+  0: The maximum resident set size (KB)                   = 1263244
 
-Test 093 hafs_regional_docn_oisst PASS
+Test 092 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/hafs_regional_datm_cdeps
-Checking test 094 hafs_regional_datm_cdeps results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/hafs_regional_datm_cdeps
+Checking test 093 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-  0: The total amount of wall time                        = 1245.093749
-  0: The maximum resident set size (KB)                   = 950820
+  0: The total amount of wall time                        = 1216.226459
+  0: The maximum resident set size (KB)                   = 951640
 
-Test 094 hafs_regional_datm_cdeps PASS
+Test 093 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_control_cfsr
-Checking test 095 datm_cdeps_control_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_control_cfsr
+Checking test 094 datm_cdeps_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                        = 197.157195
- 0: The maximum resident set size (KB)                   = 905132
+ 0: The total amount of wall time                        = 195.124307
+ 0: The maximum resident set size (KB)                   = 904376
 
-Test 095 datm_cdeps_control_cfsr PASS
+Test 094 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_restart_cfsr
-Checking test 096 datm_cdeps_restart_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_restart_cfsr
+Checking test 095 datm_cdeps_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                        = 114.265578
- 0: The maximum resident set size (KB)                   = 909228
+ 0: The total amount of wall time                        = 116.990998
+ 0: The maximum resident set size (KB)                   = 914192
 
-Test 096 datm_cdeps_restart_cfsr PASS
+Test 095 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_gefs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_control_gefs
-Checking test 097 datm_cdeps_control_gefs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_gefs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_control_gefs
+Checking test 096 datm_cdeps_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                        = 197.548338
- 0: The maximum resident set size (KB)                   = 813056
+ 0: The total amount of wall time                        = 192.132615
+ 0: The maximum resident set size (KB)                   = 814596
 
-Test 097 datm_cdeps_control_gefs PASS
+Test 096 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_iau_gefs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_iau_gefs
-Checking test 098 datm_cdeps_iau_gefs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_iau_gefs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_iau_gefs
+Checking test 097 datm_cdeps_iau_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                        = 198.219753
- 0: The maximum resident set size (KB)                   = 806400
+ 0: The total amount of wall time                        = 192.978384
+ 0: The maximum resident set size (KB)                   = 810356
 
-Test 098 datm_cdeps_iau_gefs PASS
+Test 097 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_stochy_gefs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_stochy_gefs
-Checking test 099 datm_cdeps_stochy_gefs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_stochy_gefs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_stochy_gefs
+Checking test 098 datm_cdeps_stochy_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                        = 195.788385
- 0: The maximum resident set size (KB)                   = 808152
+ 0: The total amount of wall time                        = 193.751405
+ 0: The maximum resident set size (KB)                   = 810504
 
-Test 099 datm_cdeps_stochy_gefs PASS
+Test 098 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_bulk_cfsr
-Checking test 100 datm_cdeps_bulk_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_bulk_cfsr
+Checking test 099 datm_cdeps_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                        = 195.512630
- 0: The maximum resident set size (KB)                   = 905532
+ 0: The total amount of wall time                        = 195.544275
+ 0: The maximum resident set size (KB)                   = 910680
 
-Test 100 datm_cdeps_bulk_cfsr PASS
+Test 099 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_gefs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_bulk_gefs
-Checking test 101 datm_cdeps_bulk_gefs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_gefs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_bulk_gefs
+Checking test 100 datm_cdeps_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                        = 196.572254
- 0: The maximum resident set size (KB)                   = 816912
+ 0: The total amount of wall time                        = 190.145288
+ 0: The maximum resident set size (KB)                   = 807900
 
-Test 101 datm_cdeps_bulk_gefs PASS
+Test 100 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_mx025_cfsr
-Checking test 102 datm_cdeps_mx025_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_mx025_cfsr
+Checking test 101 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -2567,15 +2512,15 @@ Checking test 102 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 428.667754
-  0: The maximum resident set size (KB)                   = 751100
+  0: The total amount of wall time                        = 466.248695
+  0: The maximum resident set size (KB)                   = 750272
 
-Test 102 datm_cdeps_mx025_cfsr PASS
+Test 101 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_gefs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_mx025_gefs
-Checking test 103 datm_cdeps_mx025_gefs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_gefs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_mx025_gefs
+Checking test 102 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -2583,65 +2528,65 @@ Checking test 103 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 431.222699
-  0: The maximum resident set size (KB)                   = 707340
+  0: The total amount of wall time                        = 422.926431
+  0: The maximum resident set size (KB)                   = 700632
 
-Test 103 datm_cdeps_mx025_gefs PASS
+Test 102 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_multiple_files_cfsr
-Checking test 104 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_multiple_files_cfsr
+Checking test 103 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 194.235301
- 0: The maximum resident set size (KB)                   = 920512
+ 0: The total amount of wall time                        = 192.251576
+ 0: The maximum resident set size (KB)                   = 905204
 
-Test 104 datm_cdeps_multiple_files_cfsr PASS
+Test 103 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_3072x1536_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_3072x1536_cfsr
-Checking test 105 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_3072x1536_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_3072x1536_cfsr
+Checking test 104 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 287.785997
- 0: The maximum resident set size (KB)                   = 2120184
+ 0: The total amount of wall time                        = 262.815078
+ 0: The maximum resident set size (KB)                   = 2123992
 
-Test 105 datm_cdeps_3072x1536_cfsr PASS
+Test 104 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_gfs
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_gfs
-Checking test 106 datm_cdeps_gfs results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_gfs
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_gfs
+Checking test 105 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 269.751219
- 0: The maximum resident set size (KB)                   = 2052960
+ 0: The total amount of wall time                        = 285.530426
+ 0: The maximum resident set size (KB)                   = 2113232
 
-Test 106 datm_cdeps_gfs PASS
+Test 105 datm_cdeps_gfs PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_debug_cfsr
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/datm_cdeps_debug_cfsr
-Checking test 107 datm_cdeps_debug_cfsr results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_debug_cfsr
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/datm_cdeps_debug_cfsr
+Checking test 106 datm_cdeps_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                        = 583.619099
- 0: The maximum resident set size (KB)                   = 907860
+ 0: The total amount of wall time                        = 568.913590
+ 0: The maximum resident set size (KB)                   = 887296
 
-Test 107 datm_cdeps_debug_cfsr PASS
+Test 106 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atmwav
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_atmwav
-Checking test 108 control_atmwav results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atmwav
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_atmwav
+Checking test 107 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2684,15 +2629,15 @@ Checking test 108 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 112.726616
-  0: The maximum resident set size (KB)                   = 595732
+  0: The total amount of wall time                        = 108.150730
+  0: The maximum resident set size (KB)                   = 607848
 
-Test 108 control_atmwav PASS
+Test 107 control_atmwav PASS
 
 
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atm_aerosols
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_57649/control_atm_aerosols
-Checking test 109 control_atm_aerosols results ....
+baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atm_aerosols
+working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_279822/control_atm_aerosols
+Checking test 108 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2735,34 +2680,12 @@ Checking test 109 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 451.200579
-  0: The maximum resident set size (KB)                   = 1417108
-
-Test 109 control_atm_aerosols PASS
-
-FAILED TESTS: 
-Test hafs_regional_atm_thompson_gfdlsf 088 failed in run_test failed 
-
-REGRESSION TEST FAILED
-Fri May 27 15:13:47 GMT 2022
-Elapsed time: 01h:56m:59s. Have a nice day!
-Fri May 27 15:30:58 GMT 2022
-Start Regression test
-
-Compile 001 elapsed time 1785 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DSIMDMULTIARCH=ON
-
-baseline dir = /lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_185792/hafs_regional_atm_thompson_gfdlsf
-Checking test 001 hafs_regional_atm_thompson_gfdlsf results ....
- Comparing atmf006.nc .........OK
- Comparing sfcf006.nc .........OK
-
-  0: The total amount of wall time                        = 846.922661
-  0: The maximum resident set size (KB)                   = 1521008
+  0: The total amount of wall time                        = 448.891089
+  0: The maximum resident set size (KB)                   = 1415712
 
-Test 001 hafs_regional_atm_thompson_gfdlsf PASS
+Test 108 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 16:24:59 GMT 2022
-Elapsed time: 00h:54m:01s. Have a nice day!
+Mon May 30 14:26:13 GMT 2022
+Elapsed time: 01h:24m:23s. Have a nice day!
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
index a76e8be0f0..ae2fbcf7a6 100644
--- a/tests/RegressionTests_orion.intel.log
+++ b/tests/RegressionTests_orion.intel.log
@@ -1,25 +1,25 @@
-Fri May 27 08:17:34 CDT 2022
+Mon May 30 06:22:17 CDT 2022
 Start Regression test
 
-Compile 001 elapsed time 644 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 002 elapsed time 222 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 405 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 415 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 388 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 006 elapsed time 399 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 007 elapsed time 203 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 001 elapsed time 623 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 002 elapsed time 223 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 370 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 412 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 398 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 006 elapsed time 363 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 007 elapsed time 195 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
 Compile 008 elapsed time 172 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 174 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 181 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 559 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 012 elapsed time 629 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 013 elapsed time 188 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 014 elapsed time 103 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 547 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 016 elapsed time 355 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_control_p8
+Compile 009 elapsed time 181 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 010 elapsed time 169 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 516 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 012 elapsed time 569 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 013 elapsed time 176 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 014 elapsed time 110 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 015 elapsed time 532 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 016 elapsed time 379 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 410.115619
-  0: The maximum resident set size (KB)                   = 5030516
+  0: The total amount of wall time                        = 410.602849
+  0: The maximum resident set size (KB)                   = 5005064
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,67 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.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.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
  Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-  0: The total amount of wall time                        = 521.136864
-  0: The maximum resident set size (KB)                   = 5506144
-
-Test 002 cpld_2threads_p8 PASS
-
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_decomp_p8
-Checking test 003 cpld_decomp_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,20 +141,18 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 406.360229
-  0: The maximum resident set size (KB)                   = 5200664
+  0: The total amount of wall time                        = 255.996673
+  0: The maximum resident set size (KB)                   = 4967176
 
-Test 003 cpld_decomp_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_mpi_p8
-Checking test 004 cpld_mpi_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -228,6 +165,7 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -263,85 +201,18 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 337.117271
-  0: The maximum resident set size (KB)                   = 4763488
+  0: The total amount of wall time                        = 506.502199
+  0: The maximum resident set size (KB)                   = 5479316
 
-Test 004 cpld_mpi_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_bmark_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_bmark_p8
-Checking test 005 cpld_bmark_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20130401_0600z.nc4 .........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
-
-  0: The total amount of wall time                        = 1363.860684
-  0: The maximum resident set size (KB)                   = 6106136
-
-Test 005 cpld_bmark_p8 PASS
-
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_control_c96_p8
-Checking test 006 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_decomp_p8
+Checking test 004 cpld_decomp_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -390,16 +261,18 @@ Checking test 006 cpld_control_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 403.250368
-  0: The maximum resident set size (KB)                   = 4985700
+  0: The total amount of wall time                        = 405.159920
+  0: The maximum resident set size (KB)                   = 5173528
 
-Test 006 cpld_control_c96_p8 PASS
+Test 004 cpld_decomp_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c96_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_restart_c96_p8
-Checking test 007 cpld_restart_c96_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_mpi_p8
+Checking test 005 cpld_mpi_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -448,29 +321,31 @@ Checking test 007 cpld_restart_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-  0: The total amount of wall time                        = 263.526894
-  0: The maximum resident set size (KB)                   = 4946984
-
-Test 007 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_control_c192_p8
-Checking test 008 cpld_control_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 343.195215
+  0: The maximum resident set size (KB)                   = 4749312
+
+Test 005 cpld_mpi_p8 PASS
+
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_control_c192_p8
+Checking test 006 cpld_control_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -504,31 +379,33 @@ Checking test 008 cpld_control_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-  0: The total amount of wall time                        = 1207.458591
-  0: The maximum resident set size (KB)                   = 4886596
-
-Test 008 cpld_control_c192_p8 PASS
-
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c192_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_restart_c192_p8
-Checking test 009 cpld_restart_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
+
+  0: The total amount of wall time                        = 794.672869
+  0: The maximum resident set size (KB)                   = 4860748
+
+Test 006 cpld_control_c192_p8 PASS
+
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_control_c192_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_restart_c192_p8
+Checking test 007 cpld_restart_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -562,21 +439,23 @@ Checking test 009 cpld_restart_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 970.065539
-  0: The maximum resident set size (KB)                   = 4954096
+  0: The total amount of wall time                        = 658.720317
+  0: The maximum resident set size (KB)                   = 4910580
 
-Test 009 cpld_restart_c192_p8 PASS
+Test 007 cpld_restart_c192_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_control_c384_p8
-Checking test 010 cpld_control_c384_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_bmark_p8
+Checking test 008 cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -613,21 +492,23 @@ Checking test 010 cpld_control_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1491.493215
-  0: The maximum resident set size (KB)                   = 6059196
+  0: The total amount of wall time                        = 1379.720716
+  0: The maximum resident set size (KB)                   = 5662956
 
-Test 010 cpld_control_c384_p8 PASS
+Test 008 cpld_bmark_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_control_c384_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_restart_c384_p8
-Checking test 011 cpld_restart_c384_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_bmark_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_restart_bmark_p8
+Checking test 009 cpld_restart_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -664,31 +545,33 @@ Checking test 011 cpld_restart_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-  0: The total amount of wall time                        = 872.472048
-  0: The maximum resident set size (KB)                   = 6010864
-
-Test 011 cpld_restart_c384_p8 PASS
-
-
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/cpld_debug_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/cpld_debug_p8
-Checking test 012 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+  0: The total amount of wall time                        = 812.790310
+  0: The maximum resident set size (KB)                   = 5554352
+
+Test 009 cpld_restart_bmark_p8 PASS
+
+
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/cpld_debug_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/cpld_debug_p8
+Checking test 010 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -722,18 +605,20 @@ Checking test 012 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1160.101396
-  0: The maximum resident set size (KB)                   = 5039040
+  0: The total amount of wall time                        = 841.211508
+  0: The maximum resident set size (KB)                   = 5068332
 
-Test 012 cpld_debug_p8 PASS
+Test 010 cpld_debug_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control
-Checking test 013 control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control
+Checking test 011 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -779,15 +664,15 @@ Checking test 013 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 126.638202
-  0: The maximum resident set size (KB)                   = 640516
+  0: The total amount of wall time                        = 127.113277
+  0: The maximum resident set size (KB)                   = 646616
 
-Test 013 control PASS
+Test 011 control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_decomp
-Checking test 014 control_decomp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_decomp
+Checking test 012 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -829,29 +714,29 @@ Checking test 014 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 134.270313
-  0: The maximum resident set size (KB)                   = 635524
+  0: The total amount of wall time                        = 135.085516
+  0: The maximum resident set size (KB)                   = 634380
 
-Test 014 control_decomp PASS
+Test 012 control_decomp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_2dwrtdecomp
-Checking test 015 control_2dwrtdecomp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_2dwrtdecomp
+Checking test 013 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 120.898698
-  0: The maximum resident set size (KB)                   = 644748
+  0: The total amount of wall time                        = 120.884319
+  0: The maximum resident set size (KB)                   = 645204
 
-Test 015 control_2dwrtdecomp PASS
+Test 013 control_2dwrtdecomp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_2threads
-Checking test 016 control_2threads results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_2threads
+Checking test 014 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -893,15 +778,15 @@ Checking test 016 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 150.492831
- 0: The maximum resident set size (KB)                   = 698892
+ 0: The total amount of wall time                        = 154.958960
+ 0: The maximum resident set size (KB)                   = 698520
 
-Test 016 control_2threads PASS
+Test 014 control_2threads PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_restart
-Checking test 017 control_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_restart
+Checking test 015 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -939,15 +824,15 @@ Checking test 017 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 70.913751
-  0: The maximum resident set size (KB)                   = 468604
+  0: The total amount of wall time                        = 69.031702
+  0: The maximum resident set size (KB)                   = 468876
 
-Test 017 control_restart PASS
+Test 015 control_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_fhzero
-Checking test 018 control_fhzero results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_fhzero
+Checking test 016 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -989,15 +874,15 @@ Checking test 018 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 121.442639
-  0: The maximum resident set size (KB)                   = 641784
+  0: The total amount of wall time                        = 120.758888
+  0: The maximum resident set size (KB)                   = 642404
 
-Test 018 control_fhzero PASS
+Test 016 control_fhzero PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_CubedSphereGrid
-Checking test 019 control_CubedSphereGrid results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_CubedSphereGrid
+Checking test 017 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -1023,15 +908,15 @@ Checking test 019 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 122.883870
-  0: The maximum resident set size (KB)                   = 641756
+  0: The total amount of wall time                        = 124.877921
+  0: The maximum resident set size (KB)                   = 637920
 
-Test 019 control_CubedSphereGrid PASS
+Test 017 control_CubedSphereGrid PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_latlon
-Checking test 020 control_latlon results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_latlon
+Checking test 018 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1041,33 +926,33 @@ Checking test 020 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 125.122999
-  0: The maximum resident set size (KB)                   = 644096
+  0: The total amount of wall time                        = 126.074391
+  0: The maximum resident set size (KB)                   = 644600
 
-Test 020 control_latlon PASS
+Test 018 control_latlon PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_wrtGauss_netcdf_parallel
-Checking test 021 control_wrtGauss_netcdf_parallel results ....
- Comparing sfcf000.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_wrtGauss_netcdf_parallel
+Checking test 019 control_wrtGauss_netcdf_parallel results ....
+ Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
- Comparing atmf024.nc .........OK
+ Comparing atmf024.nc ............ALT CHECK......OK
  Comparing GFSFLX.GrbF00 .........OK
  Comparing GFSFLX.GrbF24 .........OK
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 127.366677
-  0: The maximum resident set size (KB)                   = 646076
+  0: The total amount of wall time                        = 128.104380
+  0: The maximum resident set size (KB)                   = 646332
 
-Test 021 control_wrtGauss_netcdf_parallel PASS
+Test 019 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_c48
-Checking test 022 control_c48 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_c48
+Checking test 020 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1105,15 +990,15 @@ Checking test 022 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 330.734912
-0: The maximum resident set size (KB)                   = 808304
+0: The total amount of wall time                        = 328.749094
+0: The maximum resident set size (KB)                   = 816524
 
-Test 022 control_c48 PASS
+Test 020 control_c48 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_c192
-Checking test 023 control_c192 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_c192
+Checking test 021 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1123,15 +1008,15 @@ Checking test 023 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 489.038546
-  0: The maximum resident set size (KB)                   = 799776
+  0: The total amount of wall time                        = 487.580073
+  0: The maximum resident set size (KB)                   = 798260
 
-Test 023 control_c192 PASS
+Test 021 control_c192 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_c384
-Checking test 024 control_c384 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_c384
+Checking test 022 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1141,15 +1026,15 @@ Checking test 024 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 678.574335
-  0: The maximum resident set size (KB)                   = 1083288
+  0: The total amount of wall time                        = 671.334591
+  0: The maximum resident set size (KB)                   = 1095256
 
-Test 024 control_c384 PASS
+Test 022 control_c384 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_c384gdas
-Checking test 025 control_c384gdas results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_c384gdas
+Checking test 023 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1191,15 +1076,15 @@ Checking test 025 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 595.477697
-  0: The maximum resident set size (KB)                   = 1237364
+  0: The total amount of wall time                        = 582.807874
+  0: The maximum resident set size (KB)                   = 1240780
 
-Test 025 control_c384gdas PASS
+Test 023 control_c384gdas PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_stochy
-Checking test 026 control_stochy results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_stochy
+Checking test 024 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1209,29 +1094,29 @@ Checking test 026 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 82.197116
-  0: The maximum resident set size (KB)                   = 648696
+  0: The total amount of wall time                        = 81.747095
+  0: The maximum resident set size (KB)                   = 649360
 
-Test 026 control_stochy PASS
+Test 024 control_stochy PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_stochy_restart
-Checking test 027 control_stochy_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_stochy_restart
+Checking test 025 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 52.838854
-  0: The maximum resident set size (KB)                   = 486604
+  0: The total amount of wall time                        = 46.694826
+  0: The maximum resident set size (KB)                   = 484988
 
-Test 027 control_stochy_restart PASS
+Test 025 control_stochy_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_lndp
-Checking test 028 control_lndp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_lndp
+Checking test 026 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1241,15 +1126,15 @@ Checking test 028 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 75.169321
-  0: The maximum resident set size (KB)                   = 640476
+  0: The total amount of wall time                        = 75.375195
+  0: The maximum resident set size (KB)                   = 641436
 
-Test 028 control_lndp PASS
+Test 026 control_lndp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_iovr4
-Checking test 029 control_iovr4 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_iovr4
+Checking test 027 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1263,15 +1148,15 @@ Checking test 029 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 126.861304
-  0: The maximum resident set size (KB)                   = 643900
+  0: The total amount of wall time                        = 127.093117
+  0: The maximum resident set size (KB)                   = 641256
 
-Test 029 control_iovr4 PASS
+Test 027 control_iovr4 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_iovr5
-Checking test 030 control_iovr5 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_iovr5
+Checking test 028 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1285,15 +1170,15 @@ Checking test 030 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 126.910007
-  0: The maximum resident set size (KB)                   = 639552
+  0: The total amount of wall time                        = 125.689290
+  0: The maximum resident set size (KB)                   = 647300
 
-Test 030 control_iovr5 PASS
+Test 028 control_iovr5 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_p8
-Checking test 031 control_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_p8
+Checking test 029 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1339,15 +1224,15 @@ Checking test 031 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 168.571247
-  0: The maximum resident set size (KB)                   = 1037548
+  0: The total amount of wall time                        = 167.770389
+  0: The maximum resident set size (KB)                   = 1031208
 
-Test 031 control_p8 PASS
+Test 029 control_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_p8_lndp
-Checking test 032 control_p8_lndp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_p8_lndp
+Checking test 030 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1365,15 +1250,15 @@ Checking test 032 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-  0: The total amount of wall time                        = 324.766058
-  0: The maximum resident set size (KB)                   = 1034612
+  0: The total amount of wall time                        = 320.882491
+  0: The maximum resident set size (KB)                   = 1037964
 
-Test 032 control_p8_lndp PASS
+Test 030 control_p8_lndp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_restart_p8
-Checking test 033 control_restart_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_restart_p8
+Checking test 031 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1411,15 +1296,15 @@ Checking test 033 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 92.269105
-  0: The maximum resident set size (KB)                   = 868800
+  0: The total amount of wall time                        = 92.219713
+  0: The maximum resident set size (KB)                   = 865588
 
-Test 033 control_restart_p8 PASS
+Test 031 control_restart_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_decomp_p8
-Checking test 034 control_decomp_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_decomp_p8
+Checking test 032 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1461,15 +1346,15 @@ Checking test 034 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 176.113042
-  0: The maximum resident set size (KB)                   = 1017240
+  0: The total amount of wall time                        = 175.295867
+  0: The maximum resident set size (KB)                   = 1024284
 
-Test 034 control_decomp_p8 PASS
+Test 032 control_decomp_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_2threads_p8
-Checking test 035 control_2threads_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_2threads_p8
+Checking test 033 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1511,15 +1396,15 @@ Checking test 035 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 200.994947
- 0: The maximum resident set size (KB)                   = 1098780
+ 0: The total amount of wall time                        = 198.910076
+ 0: The maximum resident set size (KB)                   = 1104484
 
-Test 035 control_2threads_p8 PASS
+Test 033 control_2threads_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_p8_rrtmgp
-Checking test 036 control_p8_rrtmgp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_p8_rrtmgp
+Checking test 034 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1565,15 +1450,15 @@ Checking test 036 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 277.895984
-  0: The maximum resident set size (KB)                   = 1150696
+  0: The total amount of wall time                        = 196.585725
+  0: The maximum resident set size (KB)                   = 1161032
 
-Test 036 control_p8_rrtmgp PASS
+Test 034 control_p8_rrtmgp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_control
-Checking test 037 regional_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_control
+Checking test 035 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1583,58 +1468,58 @@ Checking test 037 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 346.087412
- 0: The maximum resident set size (KB)                   = 830760
+ 0: The total amount of wall time                        = 333.076991
+ 0: The maximum resident set size (KB)                   = 828016
 
-Test 037 regional_control PASS
+Test 035 regional_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_restart
-Checking test 038 regional_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_restart
+Checking test 036 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 190.092237
- 0: The maximum resident set size (KB)                   = 822112
+ 0: The total amount of wall time                        = 189.314072
+ 0: The maximum resident set size (KB)                   = 824504
 
-Test 038 regional_restart PASS
+Test 036 regional_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_control_2dwrtdecomp
-Checking test 039 regional_control_2dwrtdecomp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_control_2dwrtdecomp
+Checking test 037 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 347.607774
- 0: The maximum resident set size (KB)                   = 828076
+ 0: The total amount of wall time                        = 331.347543
+ 0: The maximum resident set size (KB)                   = 815640
 
-Test 039 regional_control_2dwrtdecomp PASS
+Test 037 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_noquilt
-Checking test 040 regional_noquilt results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_noquilt
+Checking test 038 regional_noquilt 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                        = 332.246358
- 0: The maximum resident set size (KB)                   = 804268
+ 0: The total amount of wall time                        = 332.814139
+ 0: The maximum resident set size (KB)                   = 803644
 
-Test 040 regional_noquilt PASS
+Test 038 regional_noquilt PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_2threads
-Checking test 041 regional_2threads results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_2threads
+Checking test 039 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1644,29 +1529,29 @@ Checking test 041 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
- 0: The total amount of wall time                        = 230.983627
- 0: The maximum resident set size (KB)                   = 821240
+ 0: The total amount of wall time                        = 232.024647
+ 0: The maximum resident set size (KB)                   = 824928
 
-Test 041 regional_2threads PASS
+Test 039 regional_2threads PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_netcdf_parallel
-Checking test 042 regional_netcdf_parallel results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_netcdf_parallel
+Checking test 040 regional_netcdf_parallel results ....
  Comparing dynf000.nc ............ALT CHECK......OK
- Comparing dynf024.nc .........OK
+ Comparing dynf024.nc ............ALT CHECK......OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
- 0: The total amount of wall time                        = 345.165625
- 0: The maximum resident set size (KB)                   = 817800
+ 0: The total amount of wall time                        = 330.630676
+ 0: The maximum resident set size (KB)                   = 813504
 
-Test 042 regional_netcdf_parallel PASS
+Test 040 regional_netcdf_parallel PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_3km
-Checking test 043 regional_3km results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_3km
+Checking test 041 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1676,15 +1561,15 @@ Checking test 043 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 254.333737
-  0: The maximum resident set size (KB)                   = 885992
+  0: The total amount of wall time                        = 254.835835
+  0: The maximum resident set size (KB)                   = 884768
 
-Test 043 regional_3km PASS
+Test 041 regional_3km PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_control
-Checking test 044 rap_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_control
+Checking test 042 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1730,15 +1615,15 @@ Checking test 044 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 659.006022
-  0: The maximum resident set size (KB)                   = 1023816
+  0: The total amount of wall time                        = 434.374872
+  0: The maximum resident set size (KB)                   = 1034680
 
-Test 044 rap_control PASS
+Test 042 rap_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_rrtmgp
-Checking test 045 rap_rrtmgp results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_rrtmgp
+Checking test 043 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1784,15 +1669,15 @@ Checking test 045 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 467.837257
-  0: The maximum resident set size (KB)                   = 1191668
+  0: The total amount of wall time                        = 463.835295
+  0: The maximum resident set size (KB)                   = 1177732
 
-Test 045 rap_rrtmgp PASS
+Test 043 rap_rrtmgp PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_spp_sppt_shum_skeb
-Checking test 046 regional_spp_sppt_shum_skeb results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_spp_sppt_shum_skeb
+Checking test 044 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1802,15 +1687,15 @@ Checking test 046 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 296.051124
-  0: The maximum resident set size (KB)                   = 1198620
+  0: The total amount of wall time                        = 296.921788
+  0: The maximum resident set size (KB)                   = 1200060
 
-Test 046 regional_spp_sppt_shum_skeb PASS
+Test 044 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_2threads
-Checking test 047 rap_2threads results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_2threads
+Checking test 045 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1856,15 +1741,15 @@ Checking test 047 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
- 0: The total amount of wall time                        = 504.665258
- 0: The maximum resident set size (KB)                   = 1091200
+ 0: The total amount of wall time                        = 506.038961
+ 0: The maximum resident set size (KB)                   = 1103396
 
-Test 047 rap_2threads PASS
+Test 045 rap_2threads PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_restart
-Checking test 048 rap_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_restart
+Checking test 046 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1902,15 +1787,15 @@ Checking test 048 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 225.074609
-  0: The maximum resident set size (KB)                   = 943640
+  0: The total amount of wall time                        = 223.162978
+  0: The maximum resident set size (KB)                   = 945336
 
-Test 048 rap_restart PASS
+Test 046 rap_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_sfcdiff
-Checking test 049 rap_sfcdiff results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_sfcdiff
+Checking test 047 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1956,15 +1841,15 @@ Checking test 049 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 437.583296
-  0: The maximum resident set size (KB)                   = 1033588
+  0: The total amount of wall time                        = 436.101469
+  0: The maximum resident set size (KB)                   = 1031848
 
-Test 049 rap_sfcdiff PASS
+Test 047 rap_sfcdiff PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_sfcdiff_restart
-Checking test 050 rap_sfcdiff_restart results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_sfcdiff_restart
+Checking test 048 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -2002,15 +1887,15 @@ Checking test 050 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 223.929610
-  0: The maximum resident set size (KB)                   = 941160
+  0: The total amount of wall time                        = 223.751030
+  0: The maximum resident set size (KB)                   = 944488
 
-Test 050 rap_sfcdiff_restart PASS
+Test 048 rap_sfcdiff_restart PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hrrr_control
-Checking test 051 hrrr_control results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hrrr_control
+Checking test 049 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2056,15 +1941,15 @@ Checking test 051 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 419.645031
-  0: The maximum resident set size (KB)                   = 1035500
+  0: The total amount of wall time                        = 417.996889
+  0: The maximum resident set size (KB)                   = 1033092
 
-Test 051 hrrr_control PASS
+Test 049 hrrr_control PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_v1beta
-Checking test 052 rrfs_v1beta results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_v1beta
+Checking test 050 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2110,15 +1995,15 @@ Checking test 052 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 426.624128
-  0: The maximum resident set size (KB)                   = 1023436
+  0: The total amount of wall time                        = 427.363769
+  0: The maximum resident set size (KB)                   = 1020836
 
-Test 052 rrfs_v1beta PASS
+Test 050 rrfs_v1beta PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_v1nssl
-Checking test 053 rrfs_v1nssl results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_v1nssl
+Checking test 051 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2132,15 +2017,15 @@ Checking test 053 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 502.571663
-  0: The maximum resident set size (KB)                   = 702584
+  0: The total amount of wall time                        = 502.466072
+  0: The maximum resident set size (KB)                   = 700360
 
-Test 053 rrfs_v1nssl PASS
+Test 051 rrfs_v1nssl PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_v1nssl_nohailnoccn
-Checking test 054 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_v1nssl_nohailnoccn
+Checking test 052 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2154,15 +2039,15 @@ Checking test 054 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 493.078387
-  0: The maximum resident set size (KB)                   = 736616
+  0: The total amount of wall time                        = 491.641578
+  0: The maximum resident set size (KB)                   = 732740
 
-Test 054 rrfs_v1nssl_nohailnoccn PASS
+Test 052 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_conus13km_hrrr_warm
-Checking test 055 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_conus13km_hrrr_warm
+Checking test 053 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2170,15 +2055,15 @@ Checking test 055 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 192.322774
-  0: The maximum resident set size (KB)                   = 918304
+  0: The total amount of wall time                        = 187.017362
+  0: The maximum resident set size (KB)                   = 922336
 
-Test 055 rrfs_conus13km_hrrr_warm PASS
+Test 053 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_conus13km_radar_tten_warm
-Checking test 056 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_conus13km_radar_tten_warm
+Checking test 054 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2186,15 +2071,15 @@ Checking test 056 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 190.933150
-  0: The maximum resident set size (KB)                   = 924288
+  0: The total amount of wall time                        = 185.361859
+  0: The maximum resident set size (KB)                   = 923496
 
-Test 056 rrfs_conus13km_radar_tten_warm PASS
+Test 054 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_smoke_conus13km_hrrr_warm
-Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_smoke_conus13km_hrrr_warm
+Checking test 055 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2202,15 +2087,15 @@ Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 211.809463
-  0: The maximum resident set size (KB)                   = 953616
+  0: The total amount of wall time                        = 207.883077
+  0: The maximum resident set size (KB)                   = 953456
 
-Test 057 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 055 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_csawmg
-Checking test 058 control_csawmg results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_csawmg
+Checking test 056 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2220,15 +2105,15 @@ Checking test 058 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 328.164557
-  0: The maximum resident set size (KB)                   = 751896
+  0: The total amount of wall time                        = 326.923341
+  0: The maximum resident set size (KB)                   = 754412
 
-Test 058 control_csawmg PASS
+Test 056 control_csawmg PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_csawmgt
-Checking test 059 control_csawmgt results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_csawmgt
+Checking test 057 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2238,15 +2123,15 @@ Checking test 059 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 323.952330
-  0: The maximum resident set size (KB)                   = 750128
+  0: The total amount of wall time                        = 322.099575
+  0: The maximum resident set size (KB)                   = 750036
 
-Test 059 control_csawmgt PASS
+Test 057 control_csawmgt PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_flake
-Checking test 060 control_flake results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_flake
+Checking test 058 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2256,15 +2141,15 @@ Checking test 060 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 211.672137
-  0: The maximum resident set size (KB)                   = 754172
+  0: The total amount of wall time                        = 210.637918
+  0: The maximum resident set size (KB)                   = 761640
 
-Test 060 control_flake PASS
+Test 058 control_flake PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_ras
-Checking test 061 control_ras results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_ras
+Checking test 059 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2274,15 +2159,15 @@ Checking test 061 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 170.981467
-  0: The maximum resident set size (KB)                   = 720596
+  0: The total amount of wall time                        = 169.945056
+  0: The maximum resident set size (KB)                   = 716208
 
-Test 061 control_ras PASS
+Test 059 control_ras PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson
-Checking test 062 control_thompson results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson
+Checking test 060 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2292,15 +2177,15 @@ Checking test 062 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 236.491618
-  0: The maximum resident set size (KB)                   = 1038808
+  0: The total amount of wall time                        = 234.063334
+  0: The maximum resident set size (KB)                   = 1074384
 
-Test 062 control_thompson PASS
+Test 060 control_thompson PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson_no_aero
-Checking test 063 control_thompson_no_aero results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson_no_aero
+Checking test 061 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2310,55 +2195,55 @@ Checking test 063 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 222.198182
-  0: The maximum resident set size (KB)                   = 1060888
+  0: The total amount of wall time                        = 220.790021
+  0: The maximum resident set size (KB)                   = 1054580
 
-Test 063 control_thompson_no_aero PASS
+Test 061 control_thompson_no_aero PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_wam
-Checking test 064 control_wam results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_wam
+Checking test 062 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 104.739631
-  0: The maximum resident set size (KB)                   = 611956
+  0: The total amount of wall time                        = 103.529305
+  0: The maximum resident set size (KB)                   = 616836
 
-Test 064 control_wam PASS
+Test 062 control_wam PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_debug
-Checking test 065 control_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_debug
+Checking test 063 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 151.808775
-  0: The maximum resident set size (KB)                   = 807816
+  0: The total amount of wall time                        = 150.880271
+  0: The maximum resident set size (KB)                   = 812404
 
-Test 065 control_debug PASS
+Test 063 control_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_2threads_debug
-Checking test 066 control_2threads_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_2threads_debug
+Checking test 064 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
- 0: The total amount of wall time                        = 231.104306
- 0: The maximum resident set size (KB)                   = 859048
+ 0: The total amount of wall time                        = 228.919044
+ 0: The maximum resident set size (KB)                   = 859768
 
-Test 066 control_2threads_debug PASS
+Test 064 control_2threads_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_CubedSphereGrid_debug
-Checking test 067 control_CubedSphereGrid_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_CubedSphereGrid_debug
+Checking test 065 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -2384,736 +2269,740 @@ Checking test 067 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 167.374610
-  0: The maximum resident set size (KB)                   = 801048
+  0: The total amount of wall time                        = 170.426845
+  0: The maximum resident set size (KB)                   = 806928
 
-Test 067 control_CubedSphereGrid_debug PASS
+Test 065 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_wrtGauss_netcdf_parallel_debug
-Checking test 068 control_wrtGauss_netcdf_parallel_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_wrtGauss_netcdf_parallel_debug
+Checking test 066 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
- Comparing atmf001.nc .........OK
+ Comparing atmf001.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 154.285013
-  0: The maximum resident set size (KB)                   = 807216
+  0: The total amount of wall time                        = 153.029814
+  0: The maximum resident set size (KB)                   = 810792
 
-Test 068 control_wrtGauss_netcdf_parallel_debug PASS
+Test 066 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_stochy_debug
-Checking test 069 control_stochy_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_stochy_debug
+Checking test 067 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 172.551096
-  0: The maximum resident set size (KB)                   = 811028
+  0: The total amount of wall time                        = 174.954217
+  0: The maximum resident set size (KB)                   = 808692
 
-Test 069 control_stochy_debug PASS
+Test 067 control_stochy_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_lndp_debug
-Checking test 070 control_lndp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_lndp_debug
+Checking test 068 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 158.755658
-  0: The maximum resident set size (KB)                   = 811984
+  0: The total amount of wall time                        = 160.026181
+  0: The maximum resident set size (KB)                   = 808712
 
-Test 070 control_lndp_debug PASS
+Test 068 control_lndp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_csawmg_debug
-Checking test 071 control_csawmg_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_csawmg_debug
+Checking test 069 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 238.367863
-  0: The maximum resident set size (KB)                   = 848716
+  0: The total amount of wall time                        = 242.232552
+  0: The maximum resident set size (KB)                   = 854232
 
-Test 071 control_csawmg_debug PASS
+Test 069 control_csawmg_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_csawmgt_debug
-Checking test 072 control_csawmgt_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_csawmgt_debug
+Checking test 070 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 235.702176
-  0: The maximum resident set size (KB)                   = 855844
+  0: The total amount of wall time                        = 237.431120
+  0: The maximum resident set size (KB)                   = 855624
 
-Test 072 control_csawmgt_debug PASS
+Test 070 control_csawmgt_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_ras_debug
-Checking test 073 control_ras_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_ras_debug
+Checking test 071 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 158.243767
-  0: The maximum resident set size (KB)                   = 821276
+  0: The total amount of wall time                        = 158.501256
+  0: The maximum resident set size (KB)                   = 819548
 
-Test 073 control_ras_debug PASS
+Test 071 control_ras_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_diag_debug
-Checking test 074 control_diag_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_diag_debug
+Checking test 072 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 164.912546
-  0: The maximum resident set size (KB)                   = 868512
+  0: The total amount of wall time                        = 161.999088
+  0: The maximum resident set size (KB)                   = 868012
 
-Test 074 control_diag_debug PASS
+Test 072 control_diag_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_debug_p8
-Checking test 075 control_debug_p8 results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_debug_p8
+Checking test 073 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 173.349901
-  0: The maximum resident set size (KB)                   = 1194220
+  0: The total amount of wall time                        = 171.855909
+  0: The maximum resident set size (KB)                   = 1198436
 
-Test 075 control_debug_p8 PASS
+Test 073 control_debug_p8 PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson_debug
-Checking test 076 control_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson_debug
+Checking test 074 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 186.214643
-  0: The maximum resident set size (KB)                   = 1179320
+  0: The total amount of wall time                        = 181.688599
+  0: The maximum resident set size (KB)                   = 1173992
 
-Test 076 control_thompson_debug PASS
+Test 074 control_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson_no_aero_debug
-Checking test 077 control_thompson_no_aero_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson_no_aero_debug
+Checking test 075 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 173.249003
-  0: The maximum resident set size (KB)                   = 1167200
+  0: The total amount of wall time                        = 175.330754
+  0: The maximum resident set size (KB)                   = 1165576
 
-Test 077 control_thompson_no_aero_debug PASS
+Test 075 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson_extdiag_debug
-Checking test 078 control_thompson_extdiag_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson_extdiag_debug
+Checking test 076 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 192.230815
-  0: The maximum resident set size (KB)                   = 1200340
+  0: The total amount of wall time                        = 191.254355
+  0: The maximum resident set size (KB)                   = 1205984
 
-Test 078 control_thompson_extdiag_debug PASS
+Test 076 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_thompson_progcld_thompson_debug
-Checking test 079 control_thompson_progcld_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_thompson_progcld_thompson_debug
+Checking test 077 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 180.308967
-  0: The maximum resident set size (KB)                   = 1171384
+  0: The total amount of wall time                        = 181.036520
+  0: The maximum resident set size (KB)                   = 1171104
 
-Test 079 control_thompson_progcld_thompson_debug PASS
+Test 077 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/regional_debug
-Checking test 080 regional_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/regional_debug
+Checking test 078 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
- 0: The total amount of wall time                        = 247.507430
- 0: The maximum resident set size (KB)                   = 843160
+ 0: The total amount of wall time                        = 247.060549
+ 0: The maximum resident set size (KB)                   = 846096
 
-Test 080 regional_debug PASS
+Test 078 regional_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_control_debug
-Checking test 081 rap_control_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_control_debug
+Checking test 079 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 280.585571
-  0: The maximum resident set size (KB)                   = 1183988
+  0: The total amount of wall time                        = 270.181808
+  0: The maximum resident set size (KB)                   = 1180508
 
-Test 081 rap_control_debug PASS
+Test 079 rap_control_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_unified_drag_suite_debug
-Checking test 082 rap_unified_drag_suite_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_unified_drag_suite_debug
+Checking test 080 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 273.590766
-  0: The maximum resident set size (KB)                   = 1178148
+  0: The total amount of wall time                        = 274.141845
+  0: The maximum resident set size (KB)                   = 1183412
 
-Test 082 rap_unified_drag_suite_debug PASS
+Test 080 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_diag_debug
-Checking test 083 rap_diag_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_diag_debug
+Checking test 081 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 296.691401
-  0: The maximum resident set size (KB)                   = 1264112
+  0: The total amount of wall time                        = 287.070750
+  0: The maximum resident set size (KB)                   = 1266792
 
-Test 083 rap_diag_debug PASS
+Test 081 rap_diag_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_cires_ugwp_debug
-Checking test 084 rap_cires_ugwp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_cires_ugwp_debug
+Checking test 082 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 275.580783
-  0: The maximum resident set size (KB)                   = 1183132
+  0: The total amount of wall time                        = 278.006461
+  0: The maximum resident set size (KB)                   = 1183596
 
-Test 084 rap_cires_ugwp_debug PASS
+Test 082 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_unified_ugwp_debug
-Checking test 085 rap_unified_ugwp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_unified_ugwp_debug
+Checking test 083 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 281.706609
-  0: The maximum resident set size (KB)                   = 1183444
+  0: The total amount of wall time                        = 344.016966
+  0: The maximum resident set size (KB)                   = 1182876
 
-Test 085 rap_unified_ugwp_debug PASS
+Test 083 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_lndp_debug
-Checking test 086 rap_lndp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_lndp_debug
+Checking test 084 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 278.235910
-  0: The maximum resident set size (KB)                   = 1184768
+  0: The total amount of wall time                        = 274.131300
+  0: The maximum resident set size (KB)                   = 1183732
 
-Test 086 rap_lndp_debug PASS
+Test 084 rap_lndp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_flake_debug
-Checking test 087 rap_flake_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_flake_debug
+Checking test 085 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 271.485795
-  0: The maximum resident set size (KB)                   = 1181144
+  0: The total amount of wall time                        = 270.156675
+  0: The maximum resident set size (KB)                   = 1180308
 
-Test 087 rap_flake_debug PASS
+Test 085 rap_flake_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_progcld_thompson_debug
-Checking test 088 rap_progcld_thompson_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_progcld_thompson_debug
+Checking test 086 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 277.197005
-  0: The maximum resident set size (KB)                   = 1185488
+  0: The total amount of wall time                        = 278.369585
+  0: The maximum resident set size (KB)                   = 1183892
 
-Test 088 rap_progcld_thompson_debug PASS
+Test 086 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_noah_debug
-Checking test 089 rap_noah_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_noah_debug
+Checking test 087 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 273.206720
-  0: The maximum resident set size (KB)                   = 1181996
+  0: The total amount of wall time                        = 271.702557
+  0: The maximum resident set size (KB)                   = 1183668
 
-Test 089 rap_noah_debug PASS
+Test 087 rap_noah_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_rrtmgp_debug
-Checking test 090 rap_rrtmgp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_rrtmgp_debug
+Checking test 088 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 456.687505
-  0: The maximum resident set size (KB)                   = 1313652
+  0: The total amount of wall time                        = 454.559444
+  0: The maximum resident set size (KB)                   = 1308396
 
-Test 090 rap_rrtmgp_debug PASS
+Test 088 rap_rrtmgp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_sfcdiff_debug
-Checking test 091 rap_sfcdiff_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_sfcdiff_debug
+Checking test 089 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 274.372482
-  0: The maximum resident set size (KB)                   = 1184136
+  0: The total amount of wall time                        = 273.382749
+  0: The maximum resident set size (KB)                   = 1187112
 
-Test 091 rap_sfcdiff_debug PASS
+Test 089 rap_sfcdiff_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 092 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 090 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 449.514877
-  0: The maximum resident set size (KB)                   = 1183228
+  0: The total amount of wall time                        = 455.208101
+  0: The maximum resident set size (KB)                   = 1182136
 
-Test 092 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 090 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/rrfs_v1beta_debug
-Checking test 093 rrfs_v1beta_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/rrfs_v1beta_debug
+Checking test 091 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 270.248874
-  0: The maximum resident set size (KB)                   = 1178812
+  0: The total amount of wall time                        = 269.685655
+  0: The maximum resident set size (KB)                   = 1175160
 
-Test 093 rrfs_v1beta_debug PASS
+Test 091 rrfs_v1beta_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_wam_debug
-Checking test 094 control_wam_debug results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_wam_debug
+Checking test 092 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 282.536632
-  0: The maximum resident set size (KB)                   = 522508
+  0: The total amount of wall time                        = 292.103802
+  0: The maximum resident set size (KB)                   = 516316
 
-Test 094 control_wam_debug PASS
+Test 092 control_wam_debug PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_atm
-Checking test 095 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_atm
+Checking test 093 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 324.962328
-  0: The maximum resident set size (KB)                   = 933804
+  0: The total amount of wall time                        = 309.858793
+  0: The maximum resident set size (KB)                   = 985364
 
-Test 095 hafs_regional_atm PASS
+Test 093 hafs_regional_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_atm_thompson_gfdlsf
-Checking test 096 hafs_regional_atm_thompson_gfdlsf results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_atm_thompson_gfdlsf
+Checking test 094 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-  0: The total amount of wall time                        = 417.204816
-  0: The maximum resident set size (KB)                   = 1348632
+  0: The total amount of wall time                        = 409.676328
+  0: The maximum resident set size (KB)                   = 1348520
 
-Test 096 hafs_regional_atm_thompson_gfdlsf PASS
+Test 094 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_atm_ocn
-Checking test 097 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_atm_ocn
+Checking test 095 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 398.241675
-  0: The maximum resident set size (KB)                   = 1199668
+  0: The total amount of wall time                        = 397.146076
+  0: The maximum resident set size (KB)                   = 1203076
 
-Test 097 hafs_regional_atm_ocn PASS
+Test 095 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_atm_wav
-Checking test 098 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_atm_wav
+Checking test 096 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 750.807955
-  0: The maximum resident set size (KB)                   = 1193768
+  0: The total amount of wall time                        = 747.960278
+  0: The maximum resident set size (KB)                   = 1224604
 
-Test 098 hafs_regional_atm_wav PASS
+Test 096 hafs_regional_atm_wav PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_atm_ocn_wav
-Checking test 099 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_atm_ocn_wav
+Checking test 097 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 850.652337
-  0: The maximum resident set size (KB)                   = 1171056
+  0: The total amount of wall time                        = 843.478697
+  0: The maximum resident set size (KB)                   = 1201132
 
-Test 099 hafs_regional_atm_ocn_wav PASS
+Test 097 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_1nest_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_1nest_atm
-Checking test 100 hafs_regional_1nest_atm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_1nest_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_1nest_atm
+Checking test 098 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 452.524130
-  0: The maximum resident set size (KB)                   = 571208
+  0: The total amount of wall time                        = 446.630621
+  0: The maximum resident set size (KB)                   = 566956
 
-Test 100 hafs_regional_1nest_atm PASS
+Test 098 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_telescopic_2nests_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_telescopic_2nests_atm
-Checking test 101 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_telescopic_2nests_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_telescopic_2nests_atm
+Checking test 099 hafs_regional_telescopic_2nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-  0: The total amount of wall time                        = 503.673996
-  0: The maximum resident set size (KB)                   = 581544
+  0: The total amount of wall time                        = 501.324508
+  0: The maximum resident set size (KB)                   = 584508
 
-Test 101 hafs_regional_telescopic_2nests_atm PASS
+Test 099 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_1nest_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_global_1nest_atm
-Checking test 102 hafs_global_1nest_atm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_1nest_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_global_1nest_atm
+Checking test 100 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 207.795464
-  0: The maximum resident set size (KB)                   = 381904
+  0: The total amount of wall time                        = 210.668160
+  0: The maximum resident set size (KB)                   = 382368
 
-Test 102 hafs_global_1nest_atm PASS
+Test 100 hafs_global_1nest_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_multiple_4nests_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_global_multiple_4nests_atm
-Checking test 103 hafs_global_multiple_4nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_multiple_4nests_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_global_multiple_4nests_atm
+Checking test 101 hafs_global_multiple_4nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing atm.nest05.f006.nc .........OK
- Comparing sfc.nest05.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest05.f006.nc .........OK
 
-  0: The total amount of wall time                        = 630.548202
-  0: The maximum resident set size (KB)                   = 414204
+  0: The total amount of wall time                        = 578.230352
+  0: The maximum resident set size (KB)                   = 413084
 
-Test 103 hafs_global_multiple_4nests_atm PASS
+Test 101 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_specified_moving_1nest_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_specified_moving_1nest_atm
-Checking test 104 hafs_regional_specified_moving_1nest_atm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_specified_moving_1nest_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_specified_moving_1nest_atm
+Checking test 102 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 268.850449
-  0: The maximum resident set size (KB)                   = 590972
+  0: The total amount of wall time                        = 269.784760
+  0: The maximum resident set size (KB)                   = 585252
 
-Test 104 hafs_regional_specified_moving_1nest_atm PASS
+Test 102 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_storm_following_1nest_atm
-Checking test 105 hafs_regional_storm_following_1nest_atm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_storm_following_1nest_atm
+Checking test 103 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 264.272241
-  0: The maximum resident set size (KB)                   = 580188
+  0: The total amount of wall time                        = 258.762911
+  0: The maximum resident set size (KB)                   = 580036
 
-Test 105 hafs_regional_storm_following_1nest_atm PASS
+Test 103 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_storm_following_1nest_atm_ocn
-Checking test 106 hafs_regional_storm_following_1nest_atm_ocn results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_storm_following_1nest_atm_ocn
+Checking test 104 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-  0: The total amount of wall time                        = 269.815700
-  0: The maximum resident set size (KB)                   = 618360
+  0: The total amount of wall time                        = 270.452284
+  0: The maximum resident set size (KB)                   = 618120
 
-Test 106 hafs_regional_storm_following_1nest_atm_ocn PASS
+Test 104 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_storm_following_1nest_atm_ocn_wav
-Checking test 107 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_storm_following_1nest_atm_ocn_wav
+Checking test 105 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 640.822498
-  0: The maximum resident set size (KB)                   = 557132
+  0: The total amount of wall time                        = 612.363171
+  0: The maximum resident set size (KB)                   = 598604
 
-Test 107 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
+Test 105 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_storm_following_1nest_atm
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_global_storm_following_1nest_atm
-Checking test 108 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_storm_following_1nest_atm
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_global_storm_following_1nest_atm
+Checking test 106 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 83.382846
-  0: The maximum resident set size (KB)                   = 395132
+  0: The total amount of wall time                        = 77.406406
+  0: The maximum resident set size (KB)                   = 398488
 
-Test 108 hafs_global_storm_following_1nest_atm PASS
+Test 106 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_docn
-Checking test 109 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_docn
+Checking test 107 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 405.419544
-  0: The maximum resident set size (KB)                   = 1218112
+  0: The total amount of wall time                        = 397.858740
+  0: The maximum resident set size (KB)                   = 1210936
 
-Test 109 hafs_regional_docn PASS
+Test 107 hafs_regional_docn PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_docn_oisst
-Checking test 110 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_docn_oisst
+Checking test 108 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 407.206925
-  0: The maximum resident set size (KB)                   = 1198176
+  0: The total amount of wall time                        = 403.478176
+  0: The maximum resident set size (KB)                   = 1194480
 
-Test 110 hafs_regional_docn_oisst PASS
+Test 108 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/hafs_regional_datm_cdeps
-Checking test 111 hafs_regional_datm_cdeps results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/hafs_regional_datm_cdeps
+Checking test 109 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-  0: The total amount of wall time                        = 920.695139
-  0: The maximum resident set size (KB)                   = 1015836
+  0: The total amount of wall time                        = 916.433535
+  0: The maximum resident set size (KB)                   = 1011928
 
-Test 111 hafs_regional_datm_cdeps PASS
+Test 109 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_control_cfsr
-Checking test 112 datm_cdeps_control_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_control_cfsr
+Checking test 110 datm_cdeps_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                        = 143.227321
- 0: The maximum resident set size (KB)                   = 1026948
+ 0: The total amount of wall time                        = 146.419360
+ 0: The maximum resident set size (KB)                   = 1020068
 
-Test 112 datm_cdeps_control_cfsr PASS
+Test 110 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_restart_cfsr
-Checking test 113 datm_cdeps_restart_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_restart_cfsr
+Checking test 111 datm_cdeps_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                        = 106.435056
- 0: The maximum resident set size (KB)                   = 958588
+ 0: The total amount of wall time                        = 103.148827
+ 0: The maximum resident set size (KB)                   = 979988
 
-Test 113 datm_cdeps_restart_cfsr PASS
+Test 111 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_control_gefs
-Checking test 114 datm_cdeps_control_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_gefs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_control_gefs
+Checking test 112 datm_cdeps_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                        = 137.633178
- 0: The maximum resident set size (KB)                   = 933756
+ 0: The total amount of wall time                        = 137.622440
+ 0: The maximum resident set size (KB)                   = 937792
 
-Test 114 datm_cdeps_control_gefs PASS
+Test 112 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_iau_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_iau_gefs
-Checking test 115 datm_cdeps_iau_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_iau_gefs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_iau_gefs
+Checking test 113 datm_cdeps_iau_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                        = 140.624903
- 0: The maximum resident set size (KB)                   = 933528
+ 0: The total amount of wall time                        = 142.816357
+ 0: The maximum resident set size (KB)                   = 932424
 
-Test 115 datm_cdeps_iau_gefs PASS
+Test 113 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_stochy_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_stochy_gefs
-Checking test 116 datm_cdeps_stochy_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_stochy_gefs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_stochy_gefs
+Checking test 114 datm_cdeps_stochy_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                        = 142.760343
- 0: The maximum resident set size (KB)                   = 931964
+ 0: The total amount of wall time                        = 143.053185
+ 0: The maximum resident set size (KB)                   = 934984
 
-Test 116 datm_cdeps_stochy_gefs PASS
+Test 114 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_bulk_cfsr
-Checking test 117 datm_cdeps_bulk_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_bulk_cfsr
+Checking test 115 datm_cdeps_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                        = 142.924895
- 0: The maximum resident set size (KB)                   = 1017456
+ 0: The total amount of wall time                        = 142.107972
+ 0: The maximum resident set size (KB)                   = 1034788
 
-Test 117 datm_cdeps_bulk_cfsr PASS
+Test 115 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_bulk_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_bulk_gefs
-Checking test 118 datm_cdeps_bulk_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_bulk_gefs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_bulk_gefs
+Checking test 116 datm_cdeps_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                        = 141.656264
- 0: The maximum resident set size (KB)                   = 945688
+ 0: The total amount of wall time                        = 140.057034
+ 0: The maximum resident set size (KB)                   = 919868
 
-Test 118 datm_cdeps_bulk_gefs PASS
+Test 116 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_mx025_cfsr
-Checking test 119 datm_cdeps_mx025_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_mx025_cfsr
+Checking test 117 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3121,15 +3010,15 @@ Checking test 119 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 298.836200
-  0: The maximum resident set size (KB)                   = 841492
+  0: The total amount of wall time                        = 296.901583
+  0: The maximum resident set size (KB)                   = 857520
 
-Test 119 datm_cdeps_mx025_cfsr PASS
+Test 117 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_mx025_gefs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_mx025_gefs
-Checking test 120 datm_cdeps_mx025_gefs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_mx025_gefs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_mx025_gefs
+Checking test 118 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3137,65 +3026,65 @@ Checking test 120 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 297.230673
-  0: The maximum resident set size (KB)                   = 856560
+  0: The total amount of wall time                        = 297.023991
+  0: The maximum resident set size (KB)                   = 850992
 
-Test 120 datm_cdeps_mx025_gefs PASS
+Test 118 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_control_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_multiple_files_cfsr
-Checking test 121 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_control_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_multiple_files_cfsr
+Checking test 119 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 140.702888
- 0: The maximum resident set size (KB)                   = 1022012
+ 0: The total amount of wall time                        = 145.101368
+ 0: The maximum resident set size (KB)                   = 1025660
 
-Test 121 datm_cdeps_multiple_files_cfsr PASS
+Test 119 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_3072x1536_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_3072x1536_cfsr
-Checking test 122 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_3072x1536_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_3072x1536_cfsr
+Checking test 120 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 198.695958
- 0: The maximum resident set size (KB)                   = 2253176
+ 0: The total amount of wall time                        = 195.786291
+ 0: The maximum resident set size (KB)                   = 2246704
 
-Test 122 datm_cdeps_3072x1536_cfsr PASS
+Test 120 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_gfs
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_gfs
-Checking test 123 datm_cdeps_gfs results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_gfs
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_gfs
+Checking test 121 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 205.986651
- 0: The maximum resident set size (KB)                   = 2239516
+ 0: The total amount of wall time                        = 192.527291
+ 0: The maximum resident set size (KB)                   = 2230204
 
-Test 123 datm_cdeps_gfs PASS
+Test 121 datm_cdeps_gfs PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/datm_cdeps_debug_cfsr
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/datm_cdeps_debug_cfsr
-Checking test 124 datm_cdeps_debug_cfsr results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/datm_cdeps_debug_cfsr
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/datm_cdeps_debug_cfsr
+Checking test 122 datm_cdeps_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                        = 441.057776
- 0: The maximum resident set size (KB)                   = 977848
+ 0: The total amount of wall time                        = 437.481731
+ 0: The maximum resident set size (KB)                   = 970784
 
-Test 124 datm_cdeps_debug_cfsr PASS
+Test 122 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atmwav
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_atmwav
-Checking test 125 control_atmwav results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atmwav
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_atmwav
+Checking test 123 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3238,15 +3127,15 @@ Checking test 125 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 81.349751
-  0: The maximum resident set size (KB)                   = 670744
+  0: The total amount of wall time                        = 80.974592
+  0: The maximum resident set size (KB)                   = 703752
 
-Test 125 control_atmwav PASS
+Test 123 control_atmwav PASS
 
 
-baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/INTEL/control_atm_aerosols
-working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_322831/control_atm_aerosols
-Checking test 126 control_atm_aerosols results ....
+baseline dir = /work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/INTEL/control_atm_aerosols
+working dir  = /work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/rt_393406/control_atm_aerosols
+Checking test 124 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3289,12 +3178,12 @@ Checking test 126 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 342.062051
-  0: The maximum resident set size (KB)                   = 4799148
+  0: The total amount of wall time                        = 341.623036
+  0: The maximum resident set size (KB)                   = 4800520
 
-Test 126 control_atm_aerosols PASS
+Test 124 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 11:38:07 CDT 2022
-Elapsed time: 03h:20m:34s. Have a nice day!
+Mon May 30 07:33:09 CDT 2022
+Elapsed time: 01h:10m:53s. Have a nice day!
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
index 8ee7ec4c61..dade82b88f 100644
--- a/tests/RegressionTests_wcoss2.intel.log
+++ b/tests/RegressionTests_wcoss2.intel.log
@@ -1,19 +1,19 @@
-Fri May 27 14:12:58 UTC 2022
+Tue May 31 13:15:44 UTC 2022
 Start Regression test
 
-Compile 001 elapsed time 310 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 002 elapsed time 389 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 003 elapsed time 657 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 283 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 174 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 006 elapsed time 327 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 007 elapsed time 483 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 471 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 462 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 010 elapsed time 755 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control
+Compile 001 elapsed time 484 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 002 elapsed time 688 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 003 elapsed time 412 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 284 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 528 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 006 elapsed time 146 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 007 elapsed time 479 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 138 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 428 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 010 elapsed time 592 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control
 Checking test 001 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -60,14 +60,14 @@ Checking test 001 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 124.226132
-The maximum resident set size (KB)                   = 516748
+The total amount of wall time                        = 125.011207
+The maximum resident set size (KB)                   = 514692
 
 Test 001 control PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_decomp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_decomp
 Checking test 002 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -110,28 +110,28 @@ Checking test 002 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 127.705514
-The maximum resident set size (KB)                   = 512092
+The total amount of wall time                        = 128.677784
+The maximum resident set size (KB)                   = 513956
 
 Test 002 control_decomp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_2dwrtdecomp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_2dwrtdecomp
 Checking test 003 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-The total amount of wall time                        = 118.668315
-The maximum resident set size (KB)                   = 515712
+The total amount of wall time                        = 119.962313
+The maximum resident set size (KB)                   = 515992
 
 Test 003 control_2dwrtdecomp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_2threads
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_2threads
 Checking test 004 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -174,14 +174,14 @@ Checking test 004 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 368.408516
-The maximum resident set size (KB)                   = 568672
+The total amount of wall time                        = 369.504734
+The maximum resident set size (KB)                   = 566392
 
 Test 004 control_2threads PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_restart
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_restart
 Checking test 005 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -220,14 +220,14 @@ Checking test 005 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 65.507344
-The maximum resident set size (KB)                   = 252460
+The total amount of wall time                        = 65.531346
+The maximum resident set size (KB)                   = 520144
 
 Test 005 control_restart PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_fhzero
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_fhzero
 Checking test 006 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
@@ -270,14 +270,14 @@ Checking test 006 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 119.663552
-The maximum resident set size (KB)                   = 516596
+The total amount of wall time                        = 120.590311
+The maximum resident set size (KB)                   = 516176
 
 Test 006 control_fhzero PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_CubedSphereGrid
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_CubedSphereGrid
 Checking test 007 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -304,14 +304,14 @@ Checking test 007 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-The total amount of wall time                        = 120.484397
-The maximum resident set size (KB)                   = 513420
+The total amount of wall time                        = 122.016741
+The maximum resident set size (KB)                   = 514408
 
 Test 007 control_CubedSphereGrid PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_latlon
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_latlon
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_latlon
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_latlon
 Checking test 008 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -322,14 +322,14 @@ Checking test 008 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 122.205839
-The maximum resident set size (KB)                   = 512664
+The total amount of wall time                        = 123.025047
+The maximum resident set size (KB)                   = 514084
 
 Test 008 control_latlon PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_wrtGauss_netcdf_parallel
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_wrtGauss_netcdf_parallel
 Checking test 009 control_wrtGauss_netcdf_parallel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -340,14 +340,14 @@ Checking test 009 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 123.954221
-The maximum resident set size (KB)                   = 520144
+The total amount of wall time                        = 124.447491
+The maximum resident set size (KB)                   = 513988
 
 Test 009 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c48
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_c48
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c48
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_c48
 Checking test 010 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -386,14 +386,14 @@ Checking test 010 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 306.751286
-The maximum resident set size (KB)                   = 669040
+The total amount of wall time                        = 306.662090
+The maximum resident set size (KB)                   = 668452
 
 Test 010 control_c48 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c192
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_c192
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c192
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_c192
 Checking test 011 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -404,14 +404,14 @@ Checking test 011 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 491.172317
-The maximum resident set size (KB)                   = 620124
+The total amount of wall time                        = 493.855491
+The maximum resident set size (KB)                   = 617772
 
 Test 011 control_c192 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_c384
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_c384
 Checking test 012 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -422,14 +422,14 @@ Checking test 012 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 1507.602706
-The maximum resident set size (KB)                   = 886748
+The total amount of wall time                        = 1503.954926
+The maximum resident set size (KB)                   = 890572
 
 Test 012 control_c384 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_c384gdas
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_c384gdas
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_c384gdas
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_c384gdas
 Checking test 013 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -472,14 +472,14 @@ Checking test 013 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 1382.805555
-The maximum resident set size (KB)                   = 1006208
+The total amount of wall time                        = 1377.004605
+The maximum resident set size (KB)                   = 1002200
 
 Test 013 control_c384gdas PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_stochy
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_stochy
 Checking test 014 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -490,28 +490,28 @@ Checking test 014 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 83.150089
-The maximum resident set size (KB)                   = 519932
+The total amount of wall time                        = 82.768791
+The maximum resident set size (KB)                   = 518520
 
 Test 014 control_stochy PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_stochy_restart
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_stochy_restart
 Checking test 015 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 45.182672
-The maximum resident set size (KB)                   = 287940
+The total amount of wall time                        = 45.535218
+The maximum resident set size (KB)                   = 284868
 
 Test 015 control_stochy_restart PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_lndp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_lndp
 Checking test 016 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -522,14 +522,14 @@ Checking test 016 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 75.205279
-The maximum resident set size (KB)                   = 519092
+The total amount of wall time                        = 74.840477
+The maximum resident set size (KB)                   = 517640
 
 Test 016 control_lndp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr4
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_iovr4
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr4
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_iovr4
 Checking test 017 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -544,14 +544,14 @@ Checking test 017 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 124.228163
-The maximum resident set size (KB)                   = 516252
+The total amount of wall time                        = 124.236887
+The maximum resident set size (KB)                   = 516672
 
 Test 017 control_iovr4 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_iovr5
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_iovr5
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_iovr5
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_iovr5
 Checking test 018 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -566,14 +566,14 @@ Checking test 018 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 124.569640
-The maximum resident set size (KB)                   = 514584
+The total amount of wall time                        = 124.839648
+The maximum resident set size (KB)                   = 517300
 
 Test 018 control_iovr5 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_p8
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_p8
 Checking test 019 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -620,14 +620,14 @@ Checking test 019 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 172.934312
-The maximum resident set size (KB)                   = 908188
+The total amount of wall time                        = 181.471301
+The maximum resident set size (KB)                   = 914168
 
 Test 019 control_p8 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_lndp
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_p8_lndp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_lndp
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_p8_lndp
 Checking test 020 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -646,14 +646,14 @@ Checking test 020 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-The total amount of wall time                        = 320.155023
-The maximum resident set size (KB)                   = 914380
+The total amount of wall time                        = 322.537443
+The maximum resident set size (KB)                   = 908296
 
 Test 020 control_p8_lndp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_restart_p8
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_restart_p8
 Checking test 021 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -692,14 +692,14 @@ Checking test 021 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 97.926862
-The maximum resident set size (KB)                   = 649544
+The total amount of wall time                        = 99.094001
+The maximum resident set size (KB)                   = 648248
 
 Test 021 control_restart_p8 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_decomp_p8
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_decomp_p8
 Checking test 022 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -742,14 +742,14 @@ Checking test 022 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 177.513031
-The maximum resident set size (KB)                   = 905212
+The total amount of wall time                        = 186.325924
+The maximum resident set size (KB)                   = 910204
 
 Test 022 control_decomp_p8 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_2threads_p8
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_2threads_p8
 Checking test 023 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -792,14 +792,14 @@ Checking test 023 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 486.118895
-The maximum resident set size (KB)                   = 980340
+The total amount of wall time                        = 488.862048
+The maximum resident set size (KB)                   = 979824
 
 Test 023 control_2threads_p8 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_p8_rrtmgp
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_p8_rrtmgp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_p8_rrtmgp
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_p8_rrtmgp
 Checking test 024 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -846,14 +846,14 @@ Checking test 024 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 246.651858
-The maximum resident set size (KB)                   = 1026324
+The total amount of wall time                        = 251.070363
+The maximum resident set size (KB)                   = 1026976
 
 Test 024 control_p8_rrtmgp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_control
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_control
 Checking test 025 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -864,42 +864,42 @@ Checking test 025 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 295.940749
-The maximum resident set size (KB)                   = 601288
+The total amount of wall time                        = 308.602123
+The maximum resident set size (KB)                   = 601872
 
 Test 025 regional_control PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_restart
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_restart
 Checking test 026 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 161.713683
-The maximum resident set size (KB)                   = 598288
+The total amount of wall time                        = 162.098575
+The maximum resident set size (KB)                   = 597828
 
 Test 026 regional_restart PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_control_2dwrtdecomp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_control_2dwrtdecomp
 Checking test 027 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 295.867378
-The maximum resident set size (KB)                   = 599780
+The total amount of wall time                        = 300.559554
+The maximum resident set size (KB)                   = 600420
 
 Test 027 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_noquilt
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_noquilt
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_noquilt
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_noquilt
 Checking test 028 regional_noquilt results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -907,14 +907,14 @@ Checking test 028 regional_noquilt 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                        = 313.112886
-The maximum resident set size (KB)                   = 594384
+The total amount of wall time                        = 318.010487
+The maximum resident set size (KB)                   = 591644
 
 Test 028 regional_noquilt PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_2threads
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_2threads
 Checking test 029 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -925,28 +925,28 @@ Checking test 029 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 592.705001
-The maximum resident set size (KB)                   = 651436
+The total amount of wall time                        = 595.335415
+The maximum resident set size (KB)                   = 655680
 
 Test 029 regional_2threads PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_netcdf_parallel
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_netcdf_parallel
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_netcdf_parallel
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_netcdf_parallel
 Checking test 030 regional_netcdf_parallel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 294.041099
-The maximum resident set size (KB)                   = 597152
+The total amount of wall time                        = 299.982253
+The maximum resident set size (KB)                   = 599656
 
 Test 030 regional_netcdf_parallel PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_3km
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_3km
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_3km
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_3km
 Checking test 031 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -957,14 +957,14 @@ Checking test 031 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-The total amount of wall time                        = 254.335766
-The maximum resident set size (KB)                   = 655904
+The total amount of wall time                        = 253.236314
+The maximum resident set size (KB)                   = 652680
 
 Test 031 regional_3km PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_control
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_control
 Checking test 032 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1011,14 +1011,14 @@ Checking test 032 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 395.562671
-The maximum resident set size (KB)                   = 889712
+The total amount of wall time                        = 398.459496
+The maximum resident set size (KB)                   = 891372
 
 Test 032 rap_control PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_rrtmgp
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_rrtmgp
 Checking test 033 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1065,14 +1065,14 @@ Checking test 033 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 474.778798
-The maximum resident set size (KB)                   = 1011672
+The total amount of wall time                        = 472.164021
+The maximum resident set size (KB)                   = 1011880
 
 Test 033 rap_rrtmgp PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/regional_spp_sppt_shum_skeb
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_spp_sppt_shum_skeb
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/regional_spp_sppt_shum_skeb
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_spp_sppt_shum_skeb
 Checking test 034 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
@@ -1083,14 +1083,14 @@ Checking test 034 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-The total amount of wall time                        = 719.242343
-The maximum resident set size (KB)                   = 978904
+The total amount of wall time                        = 726.384097
+The maximum resident set size (KB)                   = 979688
 
 Test 034 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_2threads
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_2threads
 Checking test 035 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1137,14 +1137,14 @@ Checking test 035 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 1257.147556
-The maximum resident set size (KB)                   = 959980
+The total amount of wall time                        = 1247.303453
+The maximum resident set size (KB)                   = 954816
 
 Test 035 rap_2threads PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_restart
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_restart
 Checking test 036 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -1183,14 +1183,14 @@ Checking test 036 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.183521
-The maximum resident set size (KB)                   = 633056
+The total amount of wall time                        = 203.412534
+The maximum resident set size (KB)                   = 630552
 
 Test 036 rap_restart PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_sfcdiff
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_sfcdiff
 Checking test 037 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1237,14 +1237,14 @@ Checking test 037 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 394.746880
-The maximum resident set size (KB)                   = 892388
+The total amount of wall time                        = 401.461825
+The maximum resident set size (KB)                   = 892012
 
 Test 037 rap_sfcdiff PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_sfcdiff_restart
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_sfcdiff_restart
 Checking test 038 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -1283,14 +1283,14 @@ Checking test 038 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.486514
-The maximum resident set size (KB)                   = 628940
+The total amount of wall time                        = 199.855821
+The maximum resident set size (KB)                   = 631804
 
 Test 038 rap_sfcdiff_restart PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hrrr_control
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hrrr_control
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hrrr_control
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hrrr_control
 Checking test 039 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1337,14 +1337,14 @@ Checking test 039 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 379.743292
-The maximum resident set size (KB)                   = 893264
+The total amount of wall time                        = 383.147465
+The maximum resident set size (KB)                   = 893044
 
 Test 039 hrrr_control PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_v1beta
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_v1beta
 Checking test 040 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1391,14 +1391,14 @@ Checking test 040 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 383.618559
-The maximum resident set size (KB)                   = 886740
+The total amount of wall time                        = 383.717316
+The maximum resident set size (KB)                   = 888712
 
 Test 040 rrfs_v1beta PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_v1nssl
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_v1nssl
 Checking test 041 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1413,14 +1413,14 @@ Checking test 041 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 456.593168
-The maximum resident set size (KB)                   = 577816
+The total amount of wall time                        = 446.147605
+The maximum resident set size (KB)                   = 578908
 
 Test 041 rrfs_v1nssl PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1nssl_nohailnoccn
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_v1nssl_nohailnoccn
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1nssl_nohailnoccn
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_v1nssl_nohailnoccn
 Checking test 042 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1435,14 +1435,14 @@ Checking test 042 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 446.462091
-The maximum resident set size (KB)                   = 565900
+The total amount of wall time                        = 432.797685
+The maximum resident set size (KB)                   = 568988
 
 Test 042 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_hrrr_warm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_conus13km_hrrr_warm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_hrrr_warm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_conus13km_hrrr_warm
 Checking test 043 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1451,14 +1451,14 @@ Checking test 043 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 168.517014
-The maximum resident set size (KB)                   = 761616
+The total amount of wall time                        = 166.910229
+The maximum resident set size (KB)                   = 761768
 
 Test 043 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_conus13km_radar_tten_warm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_conus13km_radar_tten_warm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_conus13km_radar_tten_warm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_conus13km_radar_tten_warm
 Checking test 044 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1467,14 +1467,14 @@ Checking test 044 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 168.838125
-The maximum resident set size (KB)                   = 764032
+The total amount of wall time                        = 167.988172
+The maximum resident set size (KB)                   = 763044
 
 Test 044 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_smoke_conus13km_hrrr_warm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_smoke_conus13km_hrrr_warm
 Checking test 045 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1483,14 +1483,14 @@ Checking test 045 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 185.470481
-The maximum resident set size (KB)                   = 779588
+The total amount of wall time                        = 184.270056
+The maximum resident set size (KB)                   = 773984
 
 Test 045 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_csawmg
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_csawmg
 Checking test 046 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1501,14 +1501,14 @@ Checking test 046 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 338.132840
-The maximum resident set size (KB)                   = 587424
+The total amount of wall time                        = 336.499509
+The maximum resident set size (KB)                   = 587492
 
 Test 046 control_csawmg PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_csawmgt
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_csawmgt
 Checking test 047 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1519,14 +1519,14 @@ Checking test 047 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 333.201704
-The maximum resident set size (KB)                   = 587996
+The total amount of wall time                        = 333.805517
+The maximum resident set size (KB)                   = 588156
 
 Test 047 control_csawmgt PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_flake
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_flake
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_flake
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_flake
 Checking test 048 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1537,14 +1537,14 @@ Checking test 048 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 240.013209
-The maximum resident set size (KB)                   = 589532
+The total amount of wall time                        = 245.288065
+The maximum resident set size (KB)                   = 588096
 
 Test 048 control_flake PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_ras
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_ras
 Checking test 049 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1555,14 +1555,14 @@ Checking test 049 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 171.667571
-The maximum resident set size (KB)                   = 549140
+The total amount of wall time                        = 171.607619
+The maximum resident set size (KB)                   = 548392
 
 Test 049 control_ras PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson
 Checking test 050 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1573,14 +1573,14 @@ Checking test 050 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 231.763326
-The maximum resident set size (KB)                   = 904024
+The total amount of wall time                        = 230.588236
+The maximum resident set size (KB)                   = 902960
 
 Test 050 control_thompson PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson_no_aero
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson_no_aero
 Checking test 051 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1591,54 +1591,54 @@ Checking test 051 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 216.071287
-The maximum resident set size (KB)                   = 897244
+The total amount of wall time                        = 215.425369
+The maximum resident set size (KB)                   = 896284
 
 Test 051 control_thompson_no_aero PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_wam
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_wam
 Checking test 052 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-The total amount of wall time                        = 108.335348
-The maximum resident set size (KB)                   = 264168
+The total amount of wall time                        = 107.889423
+The maximum resident set size (KB)                   = 350224
 
 Test 052 control_wam PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_debug
 Checking test 053 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 152.533497
-The maximum resident set size (KB)                   = 677312
+The total amount of wall time                        = 152.001064
+The maximum resident set size (KB)                   = 672192
 
 Test 053 control_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_2threads_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_2threads_debug
 Checking test 054 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 443.903647
-The maximum resident set size (KB)                   = 724716
+The total amount of wall time                        = 443.528875
+The maximum resident set size (KB)                   = 726356
 
 Test 054 control_2threads_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_CubedSphereGrid_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_CubedSphereGrid_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_CubedSphereGrid_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_CubedSphereGrid_debug
 Checking test 055 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -1665,415 +1665,415 @@ Checking test 055 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-The total amount of wall time                        = 154.860928
-The maximum resident set size (KB)                   = 672936
+The total amount of wall time                        = 153.299420
+The maximum resident set size (KB)                   = 673168
 
 Test 055 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wrtGauss_netcdf_parallel_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_wrtGauss_netcdf_parallel_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wrtGauss_netcdf_parallel_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_wrtGauss_netcdf_parallel_debug
 Checking test 056 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 153.667196
-The maximum resident set size (KB)                   = 676224
+The total amount of wall time                        = 153.837321
+The maximum resident set size (KB)                   = 674000
 
 Test 056 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_stochy_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_stochy_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_stochy_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_stochy_debug
 Checking test 057 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 174.377639
-The maximum resident set size (KB)                   = 678624
+The total amount of wall time                        = 175.119760
+The maximum resident set size (KB)                   = 678876
 
 Test 057 control_stochy_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_lndp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_lndp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_lndp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_lndp_debug
 Checking test 058 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 156.715972
-The maximum resident set size (KB)                   = 677812
+The total amount of wall time                        = 156.347882
+The maximum resident set size (KB)                   = 677896
 
 Test 058 control_lndp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmg_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_csawmg_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmg_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_csawmg_debug
 Checking test 059 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 251.570781
-The maximum resident set size (KB)                   = 719896
+The total amount of wall time                        = 249.007323
+The maximum resident set size (KB)                   = 719528
 
 Test 059 control_csawmg_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_csawmgt_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_csawmgt_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_csawmgt_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_csawmgt_debug
 Checking test 060 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 247.185567
-The maximum resident set size (KB)                   = 720072
+The total amount of wall time                        = 249.634833
+The maximum resident set size (KB)                   = 720972
 
 Test 060 control_csawmgt_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_ras_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_ras_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_ras_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_ras_debug
 Checking test 061 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 157.806295
-The maximum resident set size (KB)                   = 686272
+The total amount of wall time                        = 158.330947
+The maximum resident set size (KB)                   = 690692
 
 Test 061 control_ras_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_diag_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_diag_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_diag_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_diag_debug
 Checking test 062 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 158.285914
-The maximum resident set size (KB)                   = 732392
+The total amount of wall time                        = 158.711837
+The maximum resident set size (KB)                   = 733392
 
 Test 062 control_diag_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_debug_p8
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_debug_p8
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_debug_p8
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_debug_p8
 Checking test 063 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 177.948348
-The maximum resident set size (KB)                   = 1068048
+The total amount of wall time                        = 176.342779
+The maximum resident set size (KB)                   = 1071460
 
 Test 063 control_debug_p8 PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson_debug
 Checking test 064 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 183.563721
-The maximum resident set size (KB)                   = 1044164
+The total amount of wall time                        = 182.826210
+The maximum resident set size (KB)                   = 1039172
 
 Test 064 control_thompson_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_no_aero_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson_no_aero_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_no_aero_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson_no_aero_debug
 Checking test 065 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 176.754827
-The maximum resident set size (KB)                   = 1039556
+The total amount of wall time                        = 176.829961
+The maximum resident set size (KB)                   = 1040500
 
 Test 065 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_debug_extdiag
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson_extdiag_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_debug_extdiag
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson_extdiag_debug
 Checking test 066 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 189.491322
-The maximum resident set size (KB)                   = 1072820
+The total amount of wall time                        = 191.541754
+The maximum resident set size (KB)                   = 1072232
 
 Test 066 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_thompson_progcld_thompson_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_thompson_progcld_thompson_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_thompson_progcld_thompson_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_thompson_progcld_thompson_debug
 Checking test 067 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 184.010935
-The maximum resident set size (KB)                   = 1037892
+The total amount of wall time                        = 183.278162
+The maximum resident set size (KB)                   = 1040308
 
 Test 067 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/fv3_regional_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/regional_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/fv3_regional_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/regional_debug
 Checking test 068 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
-The total amount of wall time                        = 257.694652
-The maximum resident set size (KB)                   = 622388
+The total amount of wall time                        = 270.294470
+The maximum resident set size (KB)                   = 622300
 
 Test 068 regional_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_control_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_control_debug
 Checking test 069 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 290.760644
-The maximum resident set size (KB)                   = 1047680
+The total amount of wall time                        = 291.404837
+The maximum resident set size (KB)                   = 1046844
 
 Test 069 rap_control_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_control_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_unified_drag_suite_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_control_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_unified_drag_suite_debug
 Checking test 070 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 291.070376
-The maximum resident set size (KB)                   = 1045884
+The total amount of wall time                        = 291.304923
+The maximum resident set size (KB)                   = 1050568
 
 Test 070 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_diag_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_diag_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_diag_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_diag_debug
 Checking test 071 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 301.794665
-The maximum resident set size (KB)                   = 1136308
+The total amount of wall time                        = 301.456946
+The maximum resident set size (KB)                   = 1132732
 
 Test 071 rap_diag_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_cires_ugwp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_cires_ugwp_debug
 Checking test 072 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 298.199376
-The maximum resident set size (KB)                   = 1048832
+The total amount of wall time                        = 296.701572
+The maximum resident set size (KB)                   = 1051404
 
 Test 072 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_cires_ugwp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_unified_ugwp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_cires_ugwp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_unified_ugwp_debug
 Checking test 073 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 298.359158
-The maximum resident set size (KB)                   = 1045284
+The total amount of wall time                        = 299.221965
+The maximum resident set size (KB)                   = 1049596
 
 Test 073 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_lndp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_lndp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_lndp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_lndp_debug
 Checking test 074 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 293.684059
-The maximum resident set size (KB)                   = 1048292
+The total amount of wall time                        = 292.781960
+The maximum resident set size (KB)                   = 1050120
 
 Test 074 rap_lndp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_flake_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_flake_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_flake_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_flake_debug
 Checking test 075 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 290.967571
-The maximum resident set size (KB)                   = 1044096
+The total amount of wall time                        = 292.016237
+The maximum resident set size (KB)                   = 1051068
 
 Test 075 rap_flake_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_progcld_thompson_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_progcld_thompson_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_progcld_thompson_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_progcld_thompson_debug
 Checking test 076 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 291.410414
-The maximum resident set size (KB)                   = 1042868
+The total amount of wall time                        = 290.154238
+The maximum resident set size (KB)                   = 1046392
 
 Test 076 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_noah_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_noah_debug
 Checking test 077 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 286.732659
-The maximum resident set size (KB)                   = 1045892
+The total amount of wall time                        = 286.881114
+The maximum resident set size (KB)                   = 1040532
 
 Test 077 rap_noah_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_rrtmgp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_rrtmgp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_rrtmgp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_rrtmgp_debug
 Checking test 078 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 490.007836
-The maximum resident set size (KB)                   = 1170052
+The total amount of wall time                        = 500.734079
+The maximum resident set size (KB)                   = 1165776
 
 Test 078 rap_rrtmgp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_sfcdiff_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_sfcdiff_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_sfcdiff_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_sfcdiff_debug
 Checking test 079 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 291.602167
-The maximum resident set size (KB)                   = 1047348
+The total amount of wall time                        = 292.504805
+The maximum resident set size (KB)                   = 1043724
 
 Test 079 rap_sfcdiff_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rap_noah_sfcdiff_cires_ugwp_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rap_noah_sfcdiff_cires_ugwp_debug
 Checking test 080 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 482.208554
-The maximum resident set size (KB)                   = 1045500
+The total amount of wall time                        = 481.959731
+The maximum resident set size (KB)                   = 1043148
 
 Test 080 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/rrfs_v1beta_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/rrfs_v1beta_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/rrfs_v1beta_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/rrfs_v1beta_debug
 Checking test 081 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 288.049815
-The maximum resident set size (KB)                   = 1040844
+The total amount of wall time                        = 287.141572
+The maximum resident set size (KB)                   = 1044688
 
 Test 081 rrfs_v1beta_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/control_wam_debug
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/control_wam_debug
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/control_wam_debug
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/control_wam_debug
 Checking test 082 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-The total amount of wall time                        = 294.984831
-The maximum resident set size (KB)                   = 416672
+The total amount of wall time                        = 295.845873
+The maximum resident set size (KB)                   = 399640
 
 Test 082 control_wam_debug PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_atm
 Checking test 083 hafs_regional_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-The total amount of wall time                        = 687.095481
-The maximum resident set size (KB)                   = 788664
+The total amount of wall time                        = 690.726362
+The maximum resident set size (KB)                   = 792788
 
 Test 083 hafs_regional_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_thompson_gfdlsf
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_atm_thompson_gfdlsf
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_thompson_gfdlsf
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_atm_thompson_gfdlsf
 Checking test 084 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-The total amount of wall time                        = 802.398518
-The maximum resident set size (KB)                   = 1152148
+The total amount of wall time                        = 802.334083
+The maximum resident set size (KB)                   = 1150356
 
 Test 084 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_atm_ocn
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_atm_ocn
 Checking test 085 hafs_regional_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2082,28 +2082,30 @@ Checking test 085 hafs_regional_atm_ocn results ....
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 436.910104
-The maximum resident set size (KB)                   = 830928
+The total amount of wall time                        = 443.920398
+The maximum resident set size (KB)                   = 833376
 
 Test 085 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_wav
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_atm_wav
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_wav
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_atm_wav
 Checking test 086 hafs_regional_atm_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 701.272835
-The maximum resident set size (KB)                   = 825480
+The total amount of wall time                        = 708.738161
+The maximum resident set size (KB)                   = 864184
 
 Test 086 hafs_regional_atm_wav PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_atm_ocn_wav
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_atm_ocn_wav
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_atm_ocn_wav
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_atm_ocn_wav
 Checking test 087 hafs_regional_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2111,29 +2113,31 @@ Checking test 087 hafs_regional_atm_ocn_wav results ....
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 862.117511
-The maximum resident set size (KB)                   = 847464
+The total amount of wall time                        = 867.244722
+The maximum resident set size (KB)                   = 874744
 
 Test 087 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_1nest_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_1nest_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_1nest_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_1nest_atm
 Checking test 088 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 1047.430252
-The maximum resident set size (KB)                   = 400028
+The total amount of wall time                        = 1042.356146
+The maximum resident set size (KB)                   = 377852
 
 Test 088 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_telescopic_2nests_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_telescopic_2nests_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_telescopic_2nests_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_telescopic_2nests_atm
 Checking test 089 hafs_regional_telescopic_2nests_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2142,28 +2146,28 @@ Checking test 089 hafs_regional_telescopic_2nests_atm results ....
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest03.f006.nc .........OK
 
-The total amount of wall time                        = 1204.139086
-The maximum resident set size (KB)                   = 387228
+The total amount of wall time                        = 1196.471937
+The maximum resident set size (KB)                   = 388128
 
 Test 089 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_1nest_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_global_1nest_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_1nest_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_global_1nest_atm
 Checking test 090 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 507.644625
-The maximum resident set size (KB)                   = 374692
+The total amount of wall time                        = 512.194802
+The maximum resident set size (KB)                   = 399268
 
 Test 090 hafs_global_1nest_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_multiple_4nests_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_global_multiple_4nests_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_multiple_4nests_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_global_multiple_4nests_atm
 Checking test 091 hafs_global_multiple_4nests_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2176,42 +2180,42 @@ Checking test 091 hafs_global_multiple_4nests_atm results ....
  Comparing atm.nest05.f006.nc .........OK
  Comparing sfc.nest05.f006.nc .........OK
 
-The total amount of wall time                        = 1342.320510
-The maximum resident set size (KB)                   = 330588
+The total amount of wall time                        = 1341.677700
+The maximum resident set size (KB)                   = 350224
 
 Test 091 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_specified_moving_1nest_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_specified_moving_1nest_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_specified_moving_1nest_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_specified_moving_1nest_atm
 Checking test 092 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 628.804229
-The maximum resident set size (KB)                   = 530628
+The total amount of wall time                        = 628.341129
+The maximum resident set size (KB)                   = 387636
 
 Test 092 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_storm_following_1nest_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_storm_following_1nest_atm
 Checking test 093 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 607.723361
-The maximum resident set size (KB)                   = 384184
+The total amount of wall time                        = 606.528070
+The maximum resident set size (KB)                   = 383840
 
 Test 093 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_storm_following_1nest_atm_ocn
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_storm_following_1nest_atm_ocn
 Checking test 094 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2220,14 +2224,14 @@ Checking test 094 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-The total amount of wall time                        = 631.201780
-The maximum resident set size (KB)                   = 411024
+The total amount of wall time                        = 631.649428
+The maximum resident set size (KB)                   = 410288
 
 Test 094 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_storm_following_1nest_atm_ocn_wav
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_storm_following_1nest_atm_ocn_wav
 Checking test 095 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2238,28 +2242,28 @@ Checking test 095 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-The total amount of wall time                        = 1298.172497
-The maximum resident set size (KB)                   = 425220
+The total amount of wall time                        = 1332.564867
+The maximum resident set size (KB)                   = 466164
 
 Test 095 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_global_storm_following_1nest_atm
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_global_storm_following_1nest_atm
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_global_storm_following_1nest_atm
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_global_storm_following_1nest_atm
 Checking test 096 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 206.242091
-The maximum resident set size (KB)                   = 268924
+The total amount of wall time                        = 205.471846
+The maximum resident set size (KB)                   = 398408
 
 Test 096 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_docn
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_docn
 Checking test 097 hafs_regional_docn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2267,14 +2271,14 @@ Checking test 097 hafs_regional_docn results ....
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 392.332732
-The maximum resident set size (KB)                   = 835876
+The total amount of wall time                        = 389.979600
+The maximum resident set size (KB)                   = 832496
 
 Test 097 hafs_regional_docn PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_docn_oisst
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_docn_oisst
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_docn_oisst
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_docn_oisst
 Checking test 098 hafs_regional_docn_oisst results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2282,25 +2286,25 @@ Checking test 098 hafs_regional_docn_oisst results ....
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 390.301958
-The maximum resident set size (KB)                   = 821512
+The total amount of wall time                        = 394.530930
+The maximum resident set size (KB)                   = 821096
 
 Test 098 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220519/INTEL/hafs_regional_datm_cdeps
-working dir  = /lfs/h2/emc/ptmp/Jessica.Meixner/FV3_RT/rt_79160/hafs_regional_datm_cdeps
+baseline dir = /lfs/h2/emc/nems/noscrub/emc.nems/RT/NEMSfv3gfs/develop-20220531/INTEL/hafs_regional_datm_cdeps
+working dir  = /lfs/h2/emc/ptmp/Brian.Curtis/FV3_RT/rt_139046/hafs_regional_datm_cdeps
 Checking test 099 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-The total amount of wall time                        = 1177.353951
-The maximum resident set size (KB)                   = 836580
+The total amount of wall time                        = 1171.988089
+The maximum resident set size (KB)                   = 848056
 
 Test 099 hafs_regional_datm_cdeps PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 14:56:49 UTC 2022
-Elapsed time: 00h:43m:51s. Have a nice day!
+Tue May 31 14:05:54 UTC 2022
+Elapsed time: 00h:50m:12s. Have a nice day!
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
index b53f55a365..dba683fa38 100644
--- a/tests/RegressionTests_wcoss_cray.log
+++ b/tests/RegressionTests_wcoss_cray.log
@@ -1,18 +1,18 @@
-Fri May 27 16:16:30 UTC 2022
+Mon May 30 14:23:01 UTC 2022
 Start Regression test
 
-Compile 001 elapsed time 702 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 002 elapsed time 736 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 003 elapsed time 711 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 668 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 525 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 006 elapsed time 480 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 007 elapsed time 484 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 480 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 879 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control
+Compile 001 elapsed time 736 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 002 elapsed time 780 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 003 elapsed time 712 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 677 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 528 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 006 elapsed time 491 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 007 elapsed time 499 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 486 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 976 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control
 Checking test 001 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -59,14 +59,14 @@ Checking test 001 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 144.865352
-The maximum resident set size (KB)                   = 420904
+The total amount of wall time                        = 143.971548
+The maximum resident set size (KB)                   = 420944
 
 Test 001 control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_decomp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_decomp
 Checking test 002 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -109,28 +109,28 @@ Checking test 002 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 146.868045
-The maximum resident set size (KB)                   = 419820
+The total amount of wall time                        = 146.846067
+The maximum resident set size (KB)                   = 419840
 
 Test 002 control_decomp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_2dwrtdecomp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_2dwrtdecomp
 Checking test 003 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-The total amount of wall time                        = 137.730235
-The maximum resident set size (KB)                   = 420868
+The total amount of wall time                        = 136.018042
+The maximum resident set size (KB)                   = 421680
 
 Test 003 control_2dwrtdecomp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_restart
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_restart
 Checking test 004 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -169,14 +169,14 @@ Checking test 004 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 85.152350
-The maximum resident set size (KB)                   = 158452
+The total amount of wall time                        = 78.839507
+The maximum resident set size (KB)                   = 158464
 
 Test 004 control_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_fhzero
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_fhzero
 Checking test 005 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
@@ -219,14 +219,14 @@ Checking test 005 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 136.704434
-The maximum resident set size (KB)                   = 421608
+The total amount of wall time                        = 134.224445
+The maximum resident set size (KB)                   = 420960
 
 Test 005 control_fhzero PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_CubedSphereGrid
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_CubedSphereGrid
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_CubedSphereGrid
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_CubedSphereGrid
 Checking test 006 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -253,14 +253,14 @@ Checking test 006 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-The total amount of wall time                        = 137.693787
-The maximum resident set size (KB)                   = 421680
+The total amount of wall time                        = 136.370544
+The maximum resident set size (KB)                   = 425796
 
 Test 006 control_CubedSphereGrid PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_latlon
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_latlon
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_latlon
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_latlon
 Checking test 007 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -271,14 +271,14 @@ Checking test 007 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 140.434289
-The maximum resident set size (KB)                   = 421716
+The total amount of wall time                        = 140.063207
+The maximum resident set size (KB)                   = 420952
 
 Test 007 control_latlon PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wrtGauss_netcdf_parallel
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_wrtGauss_netcdf_parallel
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wrtGauss_netcdf_parallel
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_wrtGauss_netcdf_parallel
 Checking test 008 control_wrtGauss_netcdf_parallel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -289,14 +289,14 @@ Checking test 008 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 142.410542
-The maximum resident set size (KB)                   = 421572
+The total amount of wall time                        = 142.483794
+The maximum resident set size (KB)                   = 420892
 
 Test 008 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c48
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_c48
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c48
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_c48
 Checking test 009 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -335,14 +335,14 @@ Checking test 009 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 449.265416
-The maximum resident set size (KB)                   = 628188
+The total amount of wall time                        = 449.526991
+The maximum resident set size (KB)                   = 628156
 
 Test 009 control_c48 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c192
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_c192
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c192
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_c192
 Checking test 010 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -353,14 +353,14 @@ Checking test 010 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 549.125278
-The maximum resident set size (KB)                   = 521964
+The total amount of wall time                        = 547.322283
+The maximum resident set size (KB)                   = 522016
 
 Test 010 control_c192 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_stochy
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_stochy
 Checking test 011 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -371,28 +371,28 @@ Checking test 011 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 97.782274
-The maximum resident set size (KB)                   = 425364
+The total amount of wall time                        = 100.799683
+The maximum resident set size (KB)                   = 425384
 
 Test 011 control_stochy PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_stochy_restart
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_stochy_restart
 Checking test 012 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 55.456371
-The maximum resident set size (KB)                   = 175212
+The total amount of wall time                        = 55.984087
+The maximum resident set size (KB)                   = 175168
 
 Test 012 control_stochy_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_lndp
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_lndp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_lndp
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_lndp
 Checking test 013 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -403,14 +403,14 @@ Checking test 013 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-The total amount of wall time                        = 88.030787
-The maximum resident set size (KB)                   = 424532
+The total amount of wall time                        = 87.076595
+The maximum resident set size (KB)                   = 424552
 
 Test 013 control_lndp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_iovr4
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_iovr4
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_iovr4
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_iovr4
 Checking test 014 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -425,14 +425,14 @@ Checking test 014 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 145.450476
-The maximum resident set size (KB)                   = 420928
+The total amount of wall time                        = 145.545556
+The maximum resident set size (KB)                   = 420888
 
 Test 014 control_iovr4 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_iovr5
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_iovr5
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_iovr5
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_iovr5
 Checking test 015 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -447,14 +447,14 @@ Checking test 015 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 144.764568
-The maximum resident set size (KB)                   = 420940
+The total amount of wall time                        = 145.522374
+The maximum resident set size (KB)                   = 421000
 
 Test 015 control_iovr5 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_p8
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_p8
 Checking test 016 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -501,14 +501,14 @@ Checking test 016 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 194.244332
-The maximum resident set size (KB)                   = 810148
+The total amount of wall time                        = 194.470915
+The maximum resident set size (KB)                   = 810136
 
 Test 016 control_p8 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8_lndp
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_p8_lndp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8_lndp
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_p8_lndp
 Checking test 017 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -527,14 +527,14 @@ Checking test 017 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-The total amount of wall time                        = 351.025324
-The maximum resident set size (KB)                   = 810252
+The total amount of wall time                        = 348.967170
+The maximum resident set size (KB)                   = 810216
 
 Test 017 control_p8_lndp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_restart_p8
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_restart_p8
 Checking test 018 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -573,14 +573,14 @@ Checking test 018 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 106.408232
-The maximum resident set size (KB)                   = 546240
+The total amount of wall time                        = 105.463759
+The maximum resident set size (KB)                   = 546316
 
 Test 018 control_restart_p8 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_decomp_p8
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_decomp_p8
 Checking test 019 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -623,14 +623,14 @@ Checking test 019 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 199.633696
-The maximum resident set size (KB)                   = 803620
+The total amount of wall time                        = 198.043369
+The maximum resident set size (KB)                   = 803720
 
 Test 019 control_decomp_p8 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8_rrtmgp
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_p8_rrtmgp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8_rrtmgp
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_p8_rrtmgp
 Checking test 020 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -677,14 +677,14 @@ Checking test 020 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 233.119034
-The maximum resident set size (KB)                   = 927592
+The total amount of wall time                        = 226.921180
+The maximum resident set size (KB)                   = 926968
 
 Test 020 control_p8_rrtmgp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_control
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_control
 Checking test 021 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
@@ -695,42 +695,42 @@ Checking test 021 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 369.554596
-The maximum resident set size (KB)                   = 534444
+The total amount of wall time                        = 365.542204
+The maximum resident set size (KB)                   = 534516
 
 Test 021 regional_control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_restart
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_restart
 Checking test 022 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-The total amount of wall time                        = 222.506091
-The maximum resident set size (KB)                   = 528556
+The total amount of wall time                        = 221.460263
+The maximum resident set size (KB)                   = 528592
 
 Test 022 regional_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_control_2dwrtdecomp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_control_2dwrtdecomp
 Checking test 023 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 367.504540
-The maximum resident set size (KB)                   = 534412
+The total amount of wall time                        = 367.308079
+The maximum resident set size (KB)                   = 534476
 
 Test 023 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_noquilt
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_noquilt
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_noquilt
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_noquilt
 Checking test 024 regional_noquilt results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -738,28 +738,28 @@ Checking test 024 regional_noquilt 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                        = 400.012486
-The maximum resident set size (KB)                   = 537740
+The total amount of wall time                        = 397.388946
+The maximum resident set size (KB)                   = 537732
 
 Test 024 regional_noquilt PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_netcdf_parallel
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_netcdf_parallel
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_netcdf_parallel
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_netcdf_parallel
 Checking test 025 regional_netcdf_parallel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-The total amount of wall time                        = 367.358308
-The maximum resident set size (KB)                   = 530864
+The total amount of wall time                        = 362.307575
+The maximum resident set size (KB)                   = 530884
 
 Test 025 regional_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_3km
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_3km
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_3km
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_3km
 Checking test 026 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -770,14 +770,14 @@ Checking test 026 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-The total amount of wall time                        = 311.460007
-The maximum resident set size (KB)                   = 559892
+The total amount of wall time                        = 302.144669
+The maximum resident set size (KB)                   = 559996
 
 Test 026 regional_3km PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_control
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_control
 Checking test 027 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -824,14 +824,14 @@ Checking test 027 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 461.685559
-The maximum resident set size (KB)                   = 789356
+The total amount of wall time                        = 457.449862
+The maximum resident set size (KB)                   = 789332
 
 Test 027 rap_control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_rrtmgp
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_rrtmgp
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_rrtmgp
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_rrtmgp
 Checking test 028 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -878,14 +878,14 @@ Checking test 028 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 496.503322
-The maximum resident set size (KB)                   = 908204
+The total amount of wall time                        = 492.800605
+The maximum resident set size (KB)                   = 908112
 
 Test 028 rap_rrtmgp PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/regional_spp_sppt_shum_skeb
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_spp_sppt_shum_skeb
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/regional_spp_sppt_shum_skeb
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_spp_sppt_shum_skeb
 Checking test 029 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
@@ -896,14 +896,14 @@ Checking test 029 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-The total amount of wall time                        = 344.207216
-The maximum resident set size (KB)                   = 860388
+The total amount of wall time                        = 322.716809
+The maximum resident set size (KB)                   = 859944
 
 Test 029 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_restart
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_restart
 Checking test 030 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -942,14 +942,14 @@ Checking test 030 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 238.371241
-The maximum resident set size (KB)                   = 532116
+The total amount of wall time                        = 240.077669
+The maximum resident set size (KB)                   = 532200
 
 Test 030 rap_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_sfcdiff
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_sfcdiff
 Checking test 031 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -996,14 +996,14 @@ Checking test 031 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 469.649111
-The maximum resident set size (KB)                   = 790784
+The total amount of wall time                        = 455.668118
+The maximum resident set size (KB)                   = 790820
 
 Test 031 rap_sfcdiff PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_sfcdiff_restart
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_sfcdiff_restart
 Checking test 032 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -1042,14 +1042,14 @@ Checking test 032 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 238.892812
-The maximum resident set size (KB)                   = 531952
+The total amount of wall time                        = 237.543831
+The maximum resident set size (KB)                   = 532152
 
 Test 032 rap_sfcdiff_restart PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hrrr_control
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hrrr_control
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hrrr_control
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hrrr_control
 Checking test 033 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1096,14 +1096,14 @@ Checking test 033 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 444.861170
-The maximum resident set size (KB)                   = 790260
+The total amount of wall time                        = 436.434093
+The maximum resident set size (KB)                   = 788396
 
 Test 033 hrrr_control PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1beta
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_v1beta
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1beta
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_v1beta
 Checking test 034 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1150,14 +1150,14 @@ Checking test 034 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-The total amount of wall time                        = 455.641747
-The maximum resident set size (KB)                   = 784892
+The total amount of wall time                        = 445.407507
+The maximum resident set size (KB)                   = 784936
 
 Test 034 rrfs_v1beta PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1nssl
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_v1nssl
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1nssl
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_v1nssl
 Checking test 035 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1172,14 +1172,14 @@ Checking test 035 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 505.667493
-The maximum resident set size (KB)                   = 474932
+The total amount of wall time                        = 505.169822
+The maximum resident set size (KB)                   = 474984
 
 Test 035 rrfs_v1nssl PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1nssl_nohailnoccn
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_v1nssl_nohailnoccn
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1nssl_nohailnoccn
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_v1nssl_nohailnoccn
 Checking test 036 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -1194,14 +1194,14 @@ Checking test 036 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 490.318250
-The maximum resident set size (KB)                   = 470220
+The total amount of wall time                        = 486.298027
+The maximum resident set size (KB)                   = 470336
 
 Test 036 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_conus13km_hrrr_warm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_conus13km_hrrr_warm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_conus13km_hrrr_warm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_conus13km_hrrr_warm
 Checking test 037 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1210,14 +1210,14 @@ Checking test 037 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 268.003861
-The maximum resident set size (KB)                   = 600584
+The total amount of wall time                        = 253.858929
+The maximum resident set size (KB)                   = 600656
 
 Test 037 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_conus13km_radar_tten_warm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_conus13km_radar_tten_warm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_conus13km_radar_tten_warm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_conus13km_radar_tten_warm
 Checking test 038 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1226,14 +1226,14 @@ Checking test 038 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 269.654250
+The total amount of wall time                        = 258.511715
 The maximum resident set size (KB)                   = 603856
 
 Test 038 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_smoke_conus13km_hrrr_warm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_smoke_conus13km_hrrr_warm
 Checking test 039 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -1242,14 +1242,14 @@ Checking test 039 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-The total amount of wall time                        = 283.436436
-The maximum resident set size (KB)                   = 613560
+The total amount of wall time                        = 272.788052
+The maximum resident set size (KB)                   = 613620
 
 Test 039 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmg
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_csawmg
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmg
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_csawmg
 Checking test 040 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1260,14 +1260,14 @@ Checking test 040 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 363.009306
-The maximum resident set size (KB)                   = 488220
+The total amount of wall time                        = 360.011623
+The maximum resident set size (KB)                   = 488112
 
 Test 040 control_csawmg PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmgt
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_csawmgt
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmgt
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_csawmgt
 Checking test 041 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1278,14 +1278,14 @@ Checking test 041 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 358.643327
-The maximum resident set size (KB)                   = 488212
+The total amount of wall time                        = 356.353063
+The maximum resident set size (KB)                   = 488156
 
 Test 041 control_csawmgt PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_flake
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_flake
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_flake
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_flake
 Checking test 042 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1296,14 +1296,14 @@ Checking test 042 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 233.382871
-The maximum resident set size (KB)                   = 492624
+The total amount of wall time                        = 232.602678
+The maximum resident set size (KB)                   = 492352
 
 Test 042 control_flake PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_ras
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_ras
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_ras
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_ras
 Checking test 043 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1314,40 +1314,40 @@ Checking test 043 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-The total amount of wall time                        = 196.263625
-The maximum resident set size (KB)                   = 454444
+The total amount of wall time                        = 192.946245
+The maximum resident set size (KB)                   = 454484
 
 Test 043 control_ras PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wam
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_wam
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wam
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_wam
 Checking test 044 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-The total amount of wall time                        = 113.111962
-The maximum resident set size (KB)                   = 169316
+The total amount of wall time                        = 114.174921
+The maximum resident set size (KB)                   = 169156
 
 Test 044 control_wam PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_debug
 Checking test 045 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 144.174907
-The maximum resident set size (KB)                   = 583948
+The total amount of wall time                        = 144.636993
+The maximum resident set size (KB)                   = 584092
 
 Test 045 control_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_CubedSphereGrid_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_CubedSphereGrid_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_CubedSphereGrid_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_CubedSphereGrid_debug
 Checking test 046 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -1374,591 +1374,583 @@ Checking test 046 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-The total amount of wall time                        = 154.438849
-The maximum resident set size (KB)                   = 584524
+The total amount of wall time                        = 153.081318
+The maximum resident set size (KB)                   = 584544
 
 Test 046 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wrtGauss_netcdf_parallel_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_wrtGauss_netcdf_parallel_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wrtGauss_netcdf_parallel_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_wrtGauss_netcdf_parallel_debug
 Checking test 047 control_wrtGauss_netcdf_parallel_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 147.010801
-The maximum resident set size (KB)                   = 583932
+The total amount of wall time                        = 145.764044
+The maximum resident set size (KB)                   = 584064
 
 Test 047 control_wrtGauss_netcdf_parallel_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_stochy_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_stochy_debug
 Checking test 048 control_stochy_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 165.719404
-The maximum resident set size (KB)                   = 591472
+The total amount of wall time                        = 164.842055
+The maximum resident set size (KB)                   = 591628
 
 Test 048 control_stochy_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_lndp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_lndp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_lndp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_lndp_debug
 Checking test 049 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 149.459644
-The maximum resident set size (KB)                   = 588348
+The total amount of wall time                        = 148.683376
+The maximum resident set size (KB)                   = 588480
 
 Test 049 control_lndp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmg_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_csawmg_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmg_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_csawmg_debug
 Checking test 050 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 233.918947
-The maximum resident set size (KB)                   = 625272
+The total amount of wall time                        = 231.800887
+The maximum resident set size (KB)                   = 625408
 
 Test 050 control_csawmg_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmgt_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_csawmgt_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmgt_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_csawmgt_debug
 Checking test 051 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 231.451543
-The maximum resident set size (KB)                   = 625472
+The total amount of wall time                        = 229.260256
+The maximum resident set size (KB)                   = 625384
 
 Test 051 control_csawmgt_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_ras_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_ras_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_ras_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_ras_debug
 Checking test 052 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 150.050590
-The maximum resident set size (KB)                   = 598084
+The total amount of wall time                        = 151.187303
+The maximum resident set size (KB)                   = 598156
 
 Test 052 control_ras_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_diag_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_diag_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_diag_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_diag_debug
 Checking test 053 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 156.774214
-The maximum resident set size (KB)                   = 644244
+The total amount of wall time                        = 152.539078
+The maximum resident set size (KB)                   = 644256
 
 Test 053 control_diag_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_debug_p8
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_debug_p8
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_debug_p8
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_debug_p8
 Checking test 054 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 163.931451
-The maximum resident set size (KB)                   = 973396
+The total amount of wall time                        = 163.888163
+The maximum resident set size (KB)                   = 973472
 
 Test 054 control_debug_p8 PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_thompson_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_thompson_debug
 Checking test 055 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 177.829428
-The maximum resident set size (KB)                   = 943664
+The total amount of wall time                        = 181.531598
+The maximum resident set size (KB)                   = 943580
 
 Test 055 control_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_no_aero_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_thompson_no_aero_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_no_aero_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_thompson_no_aero_debug
 Checking test 056 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 165.635394
-The maximum resident set size (KB)                   = 941328
+The total amount of wall time                        = 164.970160
+The maximum resident set size (KB)                   = 941324
 
 Test 056 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_debug_extdiag
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_thompson_extdiag_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_debug_extdiag
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_thompson_extdiag_debug
 Checking test 057 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 186.183869
-The maximum resident set size (KB)                   = 975116
+The total amount of wall time                        = 183.117683
+The maximum resident set size (KB)                   = 974988
 
 Test 057 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_progcld_thompson_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_thompson_progcld_thompson_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_progcld_thompson_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_thompson_progcld_thompson_debug
 Checking test 058 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 178.635101
-The maximum resident set size (KB)                   = 943712
+The total amount of wall time                        = 180.294768
+The maximum resident set size (KB)                   = 943580
 
 Test 058 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/regional_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/regional_debug
 Checking test 059 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
-The total amount of wall time                        = 250.380454
-The maximum resident set size (KB)                   = 555292
+The total amount of wall time                        = 248.819014
+The maximum resident set size (KB)                   = 555316
 
 Test 059 regional_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_control_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_control_debug
 Checking test 060 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 274.890805
-The maximum resident set size (KB)                   = 953412
+The total amount of wall time                        = 269.792872
+The maximum resident set size (KB)                   = 953384
 
 Test 060 rap_control_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_unified_drag_suite_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_unified_drag_suite_debug
 Checking test 061 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 271.906060
-The maximum resident set size (KB)                   = 953416
+The total amount of wall time                        = 271.149624
+The maximum resident set size (KB)                   = 951928
 
 Test 061 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_diag_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_diag_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_diag_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_diag_debug
 Checking test 062 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 295.654046
-The maximum resident set size (KB)                   = 1035336
+The total amount of wall time                        = 286.799003
+The maximum resident set size (KB)                   = 1034796
 
 Test 062 rap_diag_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_cires_ugwp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_cires_ugwp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_cires_ugwp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_cires_ugwp_debug
 Checking test 063 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 279.895415
-The maximum resident set size (KB)                   = 954636
+The total amount of wall time                        = 275.829763
+The maximum resident set size (KB)                   = 954544
 
 Test 063 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_cires_ugwp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_unified_ugwp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_cires_ugwp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_unified_ugwp_debug
 Checking test 064 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 279.302627
-The maximum resident set size (KB)                   = 953540
+The total amount of wall time                        = 275.242162
+The maximum resident set size (KB)                   = 953404
 
 Test 064 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_lndp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_lndp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_lndp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_lndp_debug
 Checking test 065 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 276.025461
-The maximum resident set size (KB)                   = 952624
+The total amount of wall time                        = 274.465440
+The maximum resident set size (KB)                   = 952612
 
 Test 065 rap_lndp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_flake_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_flake_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_flake_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_flake_debug
 Checking test 066 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 273.088328
-The maximum resident set size (KB)                   = 953408
+The total amount of wall time                        = 271.038394
+The maximum resident set size (KB)                   = 953480
 
 Test 066 rap_flake_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_progcld_thompson_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_progcld_thompson_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_progcld_thompson_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_progcld_thompson_debug
 Checking test 067 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 273.748491
-The maximum resident set size (KB)                   = 951884
+The total amount of wall time                        = 270.856628
+The maximum resident set size (KB)                   = 951860
 
 Test 067 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_noah_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_noah_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_noah_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_noah_debug
 Checking test 068 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 267.015049
-The maximum resident set size (KB)                   = 950228
+The total amount of wall time                        = 265.264508
+The maximum resident set size (KB)                   = 950152
 
 Test 068 rap_noah_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_rrtmgp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_rrtmgp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_rrtmgp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_rrtmgp_debug
 Checking test 069 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 453.697875
-The maximum resident set size (KB)                   = 1073128
+The total amount of wall time                        = 449.044231
+The maximum resident set size (KB)                   = 1073176
 
 Test 069 rap_rrtmgp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_sfcdiff_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_sfcdiff_debug
 Checking test 070 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 276.089349
-The maximum resident set size (KB)                   = 952724
+The total amount of wall time                        = 271.863961
+The maximum resident set size (KB)                   = 952904
 
 Test 070 rap_sfcdiff_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rap_noah_sfcdiff_cires_ugwp_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rap_noah_sfcdiff_cires_ugwp_debug
 Checking test 071 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 443.721669
-The maximum resident set size (KB)                   = 950472
+The total amount of wall time                        = 439.774065
+The maximum resident set size (KB)                   = 950536
 
 Test 071 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1beta_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/rrfs_v1beta_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1beta_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/rrfs_v1beta_debug
 Checking test 072 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-The total amount of wall time                        = 267.444509
-The maximum resident set size (KB)                   = 947584
+The total amount of wall time                        = 266.800792
+The maximum resident set size (KB)                   = 947540
 
 Test 072 rrfs_v1beta_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wam_debug
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/control_wam_debug
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wam_debug
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/control_wam_debug
 Checking test 073 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-The total amount of wall time                        = 273.994307
-The maximum resident set size (KB)                   = 198444
+The total amount of wall time                        = 271.771205
+The maximum resident set size (KB)                   = 198736
 
 Test 073 control_wam_debug PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_atm
 Checking test 074 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-The total amount of wall time                        = 395.520642
-The maximum resident set size (KB)                   = 644096
+The total amount of wall time                        = 376.572017
+The maximum resident set size (KB)                   = 644516
 
 Test 074 hafs_regional_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_thompson_gfdlsf
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_atm_thompson_gfdlsf
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_thompson_gfdlsf
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_atm_thompson_gfdlsf
 Checking test 075 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-The total amount of wall time                        = 458.186585
-The maximum resident set size (KB)                   = 1005048
+The total amount of wall time                        = 436.936565
+The maximum resident set size (KB)                   = 1005120
 
 Test 075 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_ocn
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_atm_ocn
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_ocn
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_atm_ocn
 Checking test 076 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 578.107596
-The maximum resident set size (KB)                   = 668680
+The total amount of wall time                        = 544.808569
+The maximum resident set size (KB)                   = 668552
 
 Test 076 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_wav
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_atm_wav
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_wav
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_atm_wav
 Checking test 077 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 985.969205
-The maximum resident set size (KB)                   = 660928
+The total amount of wall time                        = 956.705003
+The maximum resident set size (KB)                   = 698860
 
 Test 077 hafs_regional_atm_wav PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_ocn_wav
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_atm_ocn_wav
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_ocn_wav
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_atm_ocn_wav
 Checking test 078 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-The total amount of wall time                        = 1039.914317
-The maximum resident set size (KB)                   = 681076
+The total amount of wall time                        = 1027.616731
+The maximum resident set size (KB)                   = 707888
 
 Test 078 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_1nest_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_1nest_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_1nest_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_1nest_atm
 Checking test 079 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 398.602908
-The maximum resident set size (KB)                   = 242192
+The total amount of wall time                        = 395.659099
+The maximum resident set size (KB)                   = 242308
 
 Test 079 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_telescopic_2nests_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_telescopic_2nests_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_telescopic_2nests_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_telescopic_2nests_atm
 Checking test 080 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-The total amount of wall time                        = 451.313252
+The total amount of wall time                        = 448.999170
 The maximum resident set size (KB)                   = 246972
 
 Test 080 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_global_1nest_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_global_1nest_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_global_1nest_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_global_1nest_atm
 Checking test 081 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 177.104255
-The maximum resident set size (KB)                   = 148240
+The total amount of wall time                        = 176.710439
+The maximum resident set size (KB)                   = 148340
 
 Test 081 hafs_global_1nest_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_specified_moving_1nest_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_specified_moving_1nest_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_specified_moving_1nest_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_specified_moving_1nest_atm
 Checking test 082 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 249.864053
-The maximum resident set size (KB)                   = 253228
+The total amount of wall time                        = 247.263668
+The maximum resident set size (KB)                   = 251876
 
 Test 082 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_storm_following_1nest_atm
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_storm_following_1nest_atm
 Checking test 083 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 237.478623
-The maximum resident set size (KB)                   = 251800
+The total amount of wall time                        = 233.747983
+The maximum resident set size (KB)                   = 252004
 
 Test 083 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_storm_following_1nest_atm_ocn
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_storm_following_1nest_atm_ocn
 Checking test 084 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-The total amount of wall time                        = 279.183365
-The maximum resident set size (KB)                   = 278896
+The total amount of wall time                        = 275.184006
+The maximum resident set size (KB)                   = 278748
 
 Test 084 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_26092/hafs_regional_storm_following_1nest_atm_ocn_wav
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_regional_storm_following_1nest_atm_ocn_wav
 Checking test 085 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-The total amount of wall time                        = 572.972590
-The maximum resident set size (KB)                   = 294136
+The total amount of wall time                        = 582.363258
+The maximum resident set size (KB)                   = 334016
 
 Test 085 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
-Test 086 hafs_global_storm_following_1nest_atm FAIL
 
-FAILED TESTS: 
-Test hafs_global_storm_following_1nest_atm 086 failed in run_test failed 
-
-REGRESSION TEST FAILED
-Fri May 27 16:58:14 UTC 2022
-Elapsed time: 00h:41m:44s. Have a nice day!
-Fri May 27 17:01:28 UTC 2022
-Start Regression test
-
-Compile 001 elapsed time 935 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_global_storm_following_1nest_atm
-working dir  = /gpfs/hps3/stmp/Jessica.Meixner/FV3_RT/rt_29006/hafs_global_storm_following_1nest_atm
-Checking test 001 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_global_storm_following_1nest_atm
+working dir  = /gpfs/hps3/stmp/Denise.Worthen/FV3_RT/rt_29060/hafs_global_storm_following_1nest_atm
+Checking test 086 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-The total amount of wall time                        = 70.374941
-The maximum resident set size (KB)                   = 166140
+The total amount of wall time                        = 68.331041
+The maximum resident set size (KB)                   = 166376
 
-Test 001 hafs_global_storm_following_1nest_atm PASS
+Test 086 hafs_global_storm_following_1nest_atm PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 17:21:16 UTC 2022
-Elapsed time: 00h:19m:48s. Have a nice day!
+Mon May 30 15:02:00 UTC 2022
+Elapsed time: 00h:39m:00s. Have a nice day!
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
index f9b18cd438..4acc751415 100644
--- a/tests/RegressionTests_wcoss_dell_p3.log
+++ b/tests/RegressionTests_wcoss_dell_p3.log
@@ -1,25 +1,25 @@
-Fri May 27 17:10:07 UTC 2022
+Mon May 30 15:09:44 UTC 2022
 Start Regression test
 
-Compile 001 elapsed time 2388 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 002 elapsed time 582 seconds. -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 003 elapsed time 1124 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 004 elapsed time 1314 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 005 elapsed time 1228 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 006 elapsed time 1010 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 007 elapsed time 443 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 008 elapsed time 397 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 009 elapsed time 368 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 010 elapsed time 286 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile 011 elapsed time 1807 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 012 elapsed time 1732 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 013 elapsed time 1436 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile 014 elapsed time 992 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile 015 elapsed time 2309 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile 016 elapsed time 1163 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_control_p8
+Compile 001 elapsed time 2287 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 002 elapsed time 626 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 003 elapsed time 1102 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 004 elapsed time 1276 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 005 elapsed time 1192 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 006 elapsed time 869 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 007 elapsed time 429 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 008 elapsed time 333 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP,FV3_RAP_cires_ugwp,FV3_RAP_unified_ugwp,FV3_RAP_flake -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 009 elapsed time 354 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_RAP_noah,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 010 elapsed time 280 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile 011 elapsed time 1766 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 012 elapsed time 1747 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 013 elapsed time 785 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile 014 elapsed time 308 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile 015 elapsed time 1480 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile 016 elapsed time 1017 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v16 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_control_p8
 Checking test 001 cpld_control_p8 results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -45,6 +45,7 @@ Checking test 001 cpld_control_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -80,20 +81,18 @@ Checking test 001 cpld_control_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 438.326569
-[0] The maximum resident set size (KB)                   = 1459420
+[0] The total amount of wall time                        = 445.303304
+[0] The maximum resident set size (KB)                   = 1469580
 
 Test 001 cpld_control_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_2threads_p8
-Checking test 002 cpld_2threads_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_restart_p8
+Checking test 002 cpld_restart_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -106,67 +105,7 @@ Checking test 002 cpld_2threads_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.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.2021-03-23-21600.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
  Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-[0] The total amount of wall time                        = 493.139567
-[0] The maximum resident set size (KB)                   = 2193624
-
-Test 002 cpld_2threads_p8 PASS
-
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_decomp_p8
-Checking test 003 cpld_decomp_p8 results ....
- Comparing sfcf024.tile1.nc .........OK
- Comparing sfcf024.tile2.nc .........OK
- Comparing sfcf024.tile3.nc .........OK
- Comparing sfcf024.tile4.nc .........OK
- Comparing sfcf024.tile5.nc .........OK
- Comparing sfcf024.tile6.nc .........OK
- Comparing atmf024.tile1.nc .........OK
- Comparing atmf024.tile2.nc .........OK
- Comparing atmf024.tile3.nc .........OK
- Comparing atmf024.tile4.nc .........OK
- Comparing atmf024.tile5.nc .........OK
- Comparing atmf024.tile6.nc .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -202,20 +141,18 @@ Checking test 003 cpld_decomp_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 456.821354
-[0] The maximum resident set size (KB)                   = 1622196
+[0] The total amount of wall time                        = 266.064885
+[0] The maximum resident set size (KB)                   = 1434028
 
-Test 003 cpld_decomp_p8 PASS
+Test 002 cpld_restart_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_mpi_p8
-Checking test 004 cpld_mpi_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_2threads_p8
+Checking test 003 cpld_2threads_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -228,6 +165,7 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing atmf024.tile4.nc .........OK
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -263,85 +201,18 @@ Checking test 004 cpld_mpi_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
- Comparing gocart.inst_aod.20210323_0600z.nc4 .........OK
- Comparing 20210323.060000.out_grd.glo_1deg .........OK
- Comparing 20210323.060000.out_pnt.points .........OK
- Comparing 20210323.060000.restart.glo_1deg .........OK
-
-[0] The total amount of wall time                        = 383.790219
-[0] The maximum resident set size (KB)                   = 1268252
-
-Test 004 cpld_mpi_p8 PASS
-
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_bmark_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_bmark_p8
-Checking test 005 cpld_bmark_p8 results ....
- Comparing sfcf006.nc .........OK
- Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20130401_0600z.nc4 .........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
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 1395.275241
-[0] The maximum resident set size (KB)                   = 2972668
+[0] The total amount of wall time                        = 487.071210
+[0] The maximum resident set size (KB)                   = 2205764
 
-Test 005 cpld_bmark_p8 PASS
+Test 003 cpld_2threads_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c96_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_control_c96_p8
-Checking test 006 cpld_control_c96_p8 results ....
- Comparing sfcf021.tile1.nc .........OK
- Comparing sfcf021.tile2.nc .........OK
- Comparing sfcf021.tile3.nc .........OK
- Comparing sfcf021.tile4.nc .........OK
- Comparing sfcf021.tile5.nc .........OK
- Comparing sfcf021.tile6.nc .........OK
- Comparing atmf021.tile1.nc .........OK
- Comparing atmf021.tile2.nc .........OK
- Comparing atmf021.tile3.nc .........OK
- Comparing atmf021.tile4.nc .........OK
- Comparing atmf021.tile5.nc .........OK
- Comparing atmf021.tile6.nc .........OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_decomp_p8
+Checking test 004 cpld_decomp_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -390,16 +261,18 @@ Checking test 006 cpld_control_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 442.175652
-[0] The maximum resident set size (KB)                   = 1460688
+[0] The total amount of wall time                        = 441.553773
+[0] The maximum resident set size (KB)                   = 1518212
 
-Test 006 cpld_control_c96_p8 PASS
+Test 004 cpld_decomp_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c96_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_restart_c96_p8
-Checking test 007 cpld_restart_c96_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_mpi_p8
+Checking test 005 cpld_mpi_p8 results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -448,29 +321,31 @@ Checking test 007 cpld_restart_c96_p8 results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
-
-[0] The total amount of wall time                        = 260.975987
-[0] The maximum resident set size (KB)                   = 1427532
-
-Test 007 cpld_restart_c96_p8 PASS
-
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c192_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_control_c192_p8
-Checking test 008 cpld_control_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing 20210323.060000.out_pnt.ww3 .........OK
+ Comparing 20210323.060000.out_grd.ww3 .........OK
+
+[0] The total amount of wall time                        = 368.679393
+[0] The maximum resident set size (KB)                   = 1277792
+
+Test 005 cpld_mpi_p8 PASS
+
+
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_c192_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_control_c192_p8
+Checking test 006 cpld_control_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -504,31 +379,33 @@ Checking test 008 cpld_control_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
-
-[0] The total amount of wall time                        = 1326.727549
-[0] The maximum resident set size (KB)                   = 1438860
-
-Test 008 cpld_control_c192_p8 PASS
-
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c192_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_restart_c192_p8
-Checking test 009 cpld_restart_c192_p8 results ....
- Comparing sfcf036.tile1.nc .........OK
- Comparing sfcf036.tile2.nc .........OK
- Comparing sfcf036.tile3.nc .........OK
- Comparing sfcf036.tile4.nc .........OK
- Comparing sfcf036.tile5.nc .........OK
- Comparing sfcf036.tile6.nc .........OK
- Comparing atmf036.tile1.nc .........OK
- Comparing atmf036.tile2.nc .........OK
- Comparing atmf036.tile3.nc .........OK
- Comparing atmf036.tile4.nc .........OK
- Comparing atmf036.tile5.nc .........OK
- Comparing atmf036.tile6.nc .........OK
- Comparing gocart.inst_aod.20210323_1800z.nc4 .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
+
+[0] The total amount of wall time                        = 775.274839
+[0] The maximum resident set size (KB)                   = 1737844
+
+Test 006 cpld_control_c192_p8 PASS
+
+
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_control_c192_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_restart_c192_p8
+Checking test 007 cpld_restart_c192_p8 results ....
+ Comparing sfcf030.tile1.nc .........OK
+ Comparing sfcf030.tile2.nc .........OK
+ Comparing sfcf030.tile3.nc .........OK
+ Comparing sfcf030.tile4.nc .........OK
+ Comparing sfcf030.tile5.nc .........OK
+ Comparing sfcf030.tile6.nc .........OK
+ Comparing atmf030.tile1.nc .........OK
+ Comparing atmf030.tile2.nc .........OK
+ Comparing atmf030.tile3.nc .........OK
+ Comparing atmf030.tile4.nc .........OK
+ Comparing atmf030.tile5.nc .........OK
+ Comparing atmf030.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210323_1200z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -562,21 +439,23 @@ Checking test 009 cpld_restart_c192_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-23-64800.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc .........OK
+ Comparing RESTART/iced.2021-03-23-43200.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .........OK
+ Comparing 20210323.120000.out_grd.ww3 .........OK
+ Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-[0] The total amount of wall time                        = 884.486285
-[0] The maximum resident set size (KB)                   = 1647284
+[0] The total amount of wall time                        = 457.771630
+[0] The maximum resident set size (KB)                   = 1706908
 
-Test 009 cpld_restart_c192_p8 PASS
+Test 007 cpld_restart_c192_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c384_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_control_c384_p8
-Checking test 010 cpld_control_c384_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_bmark_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_bmark_p8
+Checking test 008 cpld_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -613,21 +492,23 @@ Checking test 010 cpld_control_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 1429.144633
-[0] The maximum resident set size (KB)                   = 2969584
+[0] The total amount of wall time                        = 1321.833503
+[0] The maximum resident set size (KB)                   = 2579628
 
-Test 010 cpld_control_c384_p8 PASS
+Test 008 cpld_bmark_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_control_c384_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_restart_c384_p8
-Checking test 011 cpld_restart_c384_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_bmark_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_restart_bmark_p8
+Checking test 009 cpld_restart_bmark_p8 results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing gocart.inst_aod.20130401_0600z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -664,31 +545,33 @@ Checking test 011 cpld_restart_c384_p8 results ....
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
  Comparing RESTART/MOM.res_3.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
-
-[0] The total amount of wall time                        = 894.487818
-[0] The maximum resident set size (KB)                   = 2944820
-
-Test 011 cpld_restart_c384_p8 PASS
-
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/cpld_debug_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/cpld_debug_p8
-Checking test 012 cpld_debug_p8 results ....
- Comparing sfcf006.tile1.nc .........OK
- Comparing sfcf006.tile2.nc .........OK
- Comparing sfcf006.tile3.nc .........OK
- Comparing sfcf006.tile4.nc .........OK
- Comparing sfcf006.tile5.nc .........OK
- Comparing sfcf006.tile6.nc .........OK
- Comparing atmf006.tile1.nc .........OK
- Comparing atmf006.tile2.nc .........OK
- Comparing atmf006.tile3.nc .........OK
- Comparing atmf006.tile4.nc .........OK
- Comparing atmf006.tile5.nc .........OK
- Comparing atmf006.tile6.nc .........OK
- Comparing gocart.inst_aod.20210322_1200z.nc4 .........OK
+ Comparing RESTART/iced.2013-04-01-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .........OK
+ Comparing 20130401.060000.out_pnt.ww3 .........OK
+ Comparing 20130401.060000.out_grd.ww3 .........OK
+
+[0] The total amount of wall time                        = 835.030963
+[0] The maximum resident set size (KB)                   = 2572976
+
+Test 009 cpld_restart_bmark_p8 PASS
+
+
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/cpld_debug_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/cpld_debug_p8
+Checking test 010 cpld_debug_p8 results ....
+ Comparing sfcf003.tile1.nc .........OK
+ Comparing sfcf003.tile2.nc .........OK
+ Comparing sfcf003.tile3.nc .........OK
+ Comparing sfcf003.tile4.nc .........OK
+ Comparing sfcf003.tile5.nc .........OK
+ Comparing sfcf003.tile6.nc .........OK
+ Comparing atmf003.tile1.nc .........OK
+ Comparing atmf003.tile2.nc .........OK
+ Comparing atmf003.tile3.nc .........OK
+ Comparing atmf003.tile4.nc .........OK
+ Comparing atmf003.tile5.nc .........OK
+ Comparing atmf003.tile6.nc .........OK
+ Comparing gocart.inst_aod.20210322_0900z.nc4 .........OK
  Comparing RESTART/coupler.res .........OK
  Comparing RESTART/fv_core.res.nc .........OK
  Comparing RESTART/fv_core.res.tile1.nc .........OK
@@ -722,18 +605,20 @@ Checking test 012 cpld_debug_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing RESTART/MOM.res.nc .........OK
- Comparing RESTART/iced.2021-03-22-43200.nc .........OK
- Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
+ Comparing RESTART/iced.2021-03-22-32400.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .........OK
+ Comparing 20210322.090000.out_pnt.ww3 .........OK
+ Comparing 20210322.090000.out_grd.ww3 .........OK
 
-[0] The total amount of wall time                        = 1283.874730
-[0] The maximum resident set size (KB)                   = 1518196
+[0] The total amount of wall time                        = 868.964234
+[0] The maximum resident set size (KB)                   = 1536572
 
-Test 012 cpld_debug_p8 PASS
+Test 010 cpld_debug_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control
-Checking test 013 control results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control
+Checking test 011 control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -779,15 +664,15 @@ Checking test 013 control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 146.973190
-[0] The maximum resident set size (KB)                   = 462400
+[0] The total amount of wall time                        = 148.488692
+[0] The maximum resident set size (KB)                   = 463352
 
-Test 013 control PASS
+Test 011 control PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_decomp
-Checking test 014 control_decomp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_decomp
+Checking test 012 control_decomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -829,29 +714,29 @@ Checking test 014 control_decomp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 151.347512
-[0] The maximum resident set size (KB)                   = 461140
+[0] The total amount of wall time                        = 153.565622
+[0] The maximum resident set size (KB)                   = 460052
 
-Test 014 control_decomp PASS
+Test 012 control_decomp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_2dwrtdecomp
-Checking test 015 control_2dwrtdecomp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_2dwrtdecomp
+Checking test 013 control_2dwrtdecomp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
 
-[0] The total amount of wall time                        = 142.781014
-[0] The maximum resident set size (KB)                   = 466468
+[0] The total amount of wall time                        = 142.626339
+[0] The maximum resident set size (KB)                   = 465820
 
-Test 015 control_2dwrtdecomp PASS
+Test 013 control_2dwrtdecomp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_2threads
-Checking test 016 control_2threads results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_2threads
+Checking test 014 control_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -893,15 +778,15 @@ Checking test 016 control_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 136.364864
-[0] The maximum resident set size (KB)                   = 518308
+[0] The total amount of wall time                        = 133.266383
+[0] The maximum resident set size (KB)                   = 522108
 
-Test 016 control_2threads PASS
+Test 014 control_2threads PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_restart
-Checking test 017 control_restart results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_restart
+Checking test 015 control_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -939,15 +824,15 @@ Checking test 017 control_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 75.999388
-[0] The maximum resident set size (KB)                   = 211472
+[0] The total amount of wall time                        = 77.999513
+[0] The maximum resident set size (KB)                   = 210316
 
-Test 017 control_restart PASS
+Test 015 control_restart PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_fhzero
-Checking test 018 control_fhzero results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_fhzero
+Checking test 016 control_fhzero results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
  Comparing atmf000.nc .........OK
@@ -989,15 +874,15 @@ Checking test 018 control_fhzero results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 136.998390
-[0] The maximum resident set size (KB)                   = 465300
+[0] The total amount of wall time                        = 137.007488
+[0] The maximum resident set size (KB)                   = 463584
 
-Test 018 control_fhzero PASS
+Test 016 control_fhzero PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_CubedSphereGrid
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_CubedSphereGrid
-Checking test 019 control_CubedSphereGrid results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_CubedSphereGrid
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_CubedSphereGrid
+Checking test 017 control_CubedSphereGrid results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -1023,15 +908,15 @@ Checking test 019 control_CubedSphereGrid results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 141.511299
-[0] The maximum resident set size (KB)                   = 468636
+[0] The total amount of wall time                        = 143.630662
+[0] The maximum resident set size (KB)                   = 463196
 
-Test 019 control_CubedSphereGrid PASS
+Test 017 control_CubedSphereGrid PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_latlon
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_latlon
-Checking test 020 control_latlon results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_latlon
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_latlon
+Checking test 018 control_latlon results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1041,16 +926,16 @@ Checking test 020 control_latlon results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 144.014349
-[0] The maximum resident set size (KB)                   = 462204
+[0] The total amount of wall time                        = 141.610041
+[0] The maximum resident set size (KB)                   = 462472
 
-Test 020 control_latlon PASS
+Test 018 control_latlon PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wrtGauss_netcdf_parallel
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_wrtGauss_netcdf_parallel
-Checking test 021 control_wrtGauss_netcdf_parallel results ....
- Comparing sfcf000.nc .........OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wrtGauss_netcdf_parallel
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_wrtGauss_netcdf_parallel
+Checking test 019 control_wrtGauss_netcdf_parallel results ....
+ Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf024.nc ............ALT CHECK......OK
  Comparing atmf000.nc ............ALT CHECK......OK
  Comparing atmf024.nc .........OK
@@ -1059,15 +944,15 @@ Checking test 021 control_wrtGauss_netcdf_parallel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 150.851223
-[0] The maximum resident set size (KB)                   = 464068
+[0] The total amount of wall time                        = 150.852306
+[0] The maximum resident set size (KB)                   = 466732
 
-Test 021 control_wrtGauss_netcdf_parallel PASS
+Test 019 control_wrtGauss_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c48
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_c48
-Checking test 022 control_c48 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c48
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_c48
+Checking test 020 control_c48 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1105,15 +990,15 @@ Checking test 022 control_c48 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 448.339527
-[0] The maximum resident set size (KB)                   = 663920
+[0] The total amount of wall time                        = 446.571062
+[0] The maximum resident set size (KB)                   = 667792
 
-Test 022 control_c48 PASS
+Test 020 control_c48 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c192
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_c192
-Checking test 023 control_c192 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c192
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_c192
+Checking test 021 control_c192 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1123,15 +1008,15 @@ Checking test 023 control_c192 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 557.496274
-[0] The maximum resident set size (KB)                   = 569200
+[0] The total amount of wall time                        = 566.632093
+[0] The maximum resident set size (KB)                   = 565328
 
-Test 023 control_c192 PASS
+Test 021 control_c192 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c384
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_c384
-Checking test 024 control_c384 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c384
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_c384
+Checking test 022 control_c384 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1141,15 +1026,15 @@ Checking test 024 control_c384 results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-[0] The total amount of wall time                        = 558.630003
-[0] The maximum resident set size (KB)                   = 835968
+[0] The total amount of wall time                        = 558.640977
+[0] The maximum resident set size (KB)                   = 833336
 
-Test 024 control_c384 PASS
+Test 022 control_c384 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_c384gdas
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_c384gdas
-Checking test 025 control_c384gdas results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_c384gdas
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_c384gdas
+Checking test 023 control_c384gdas results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1191,15 +1076,15 @@ Checking test 025 control_c384gdas results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 545.560903
-[0] The maximum resident set size (KB)                   = 984912
+[0] The total amount of wall time                        = 541.705935
+[0] The maximum resident set size (KB)                   = 985108
 
-Test 025 control_c384gdas PASS
+Test 023 control_c384gdas PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_stochy
-Checking test 026 control_stochy results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_stochy
+Checking test 024 control_stochy results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1209,29 +1094,29 @@ Checking test 026 control_stochy results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-[0] The total amount of wall time                        = 97.813454
-[0] The maximum resident set size (KB)                   = 469232
+[0] The total amount of wall time                        = 97.741637
+[0] The maximum resident set size (KB)                   = 469724
 
-Test 026 control_stochy PASS
+Test 024 control_stochy PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_stochy_restart
-Checking test 027 control_stochy_restart results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_stochy_restart
+Checking test 025 control_stochy_restart results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-[0] The total amount of wall time                        = 51.407719
-[0] The maximum resident set size (KB)                   = 262488
+[0] The total amount of wall time                        = 50.754801
+[0] The maximum resident set size (KB)                   = 261920
 
-Test 027 control_stochy_restart PASS
+Test 025 control_stochy_restart PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_lndp
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_lndp
-Checking test 028 control_lndp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_lndp
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_lndp
+Checking test 026 control_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1241,15 +1126,15 @@ Checking test 028 control_lndp results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-[0] The total amount of wall time                        = 88.593653
-[0] The maximum resident set size (KB)                   = 466920
+[0] The total amount of wall time                        = 87.949034
+[0] The maximum resident set size (KB)                   = 467384
 
-Test 028 control_lndp PASS
+Test 026 control_lndp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_iovr4
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_iovr4
-Checking test 029 control_iovr4 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_iovr4
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_iovr4
+Checking test 027 control_iovr4 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1263,15 +1148,15 @@ Checking test 029 control_iovr4 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 143.868324
-[0] The maximum resident set size (KB)                   = 464164
+[0] The total amount of wall time                        = 148.464803
+[0] The maximum resident set size (KB)                   = 469792
 
-Test 029 control_iovr4 PASS
+Test 027 control_iovr4 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_iovr5
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_iovr5
-Checking test 030 control_iovr5 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_iovr5
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_iovr5
+Checking test 028 control_iovr5 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1285,15 +1170,15 @@ Checking test 030 control_iovr5 results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 149.445751
-[0] The maximum resident set size (KB)                   = 466616
+[0] The total amount of wall time                        = 144.314322
+[0] The maximum resident set size (KB)                   = 466048
 
-Test 030 control_iovr5 PASS
+Test 028 control_iovr5 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_p8
-Checking test 031 control_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_p8
+Checking test 029 control_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1339,15 +1224,15 @@ Checking test 031 control_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 187.171716
-[0] The maximum resident set size (KB)                   = 843552
+[0] The total amount of wall time                        = 183.817850
+[0] The maximum resident set size (KB)                   = 843632
 
-Test 031 control_p8 PASS
+Test 029 control_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8_lndp
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_p8_lndp
-Checking test 032 control_p8_lndp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8_lndp
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_p8_lndp
+Checking test 030 control_p8_lndp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1365,15 +1250,15 @@ Checking test 032 control_p8_lndp results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-[0] The total amount of wall time                        = 353.620568
-[0] The maximum resident set size (KB)                   = 847916
+[0] The total amount of wall time                        = 357.042509
+[0] The maximum resident set size (KB)                   = 846536
 
-Test 032 control_p8_lndp PASS
+Test 030 control_p8_lndp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_restart_p8
-Checking test 033 control_restart_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_restart_p8
+Checking test 031 control_restart_p8 results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1411,15 +1296,15 @@ Checking test 033 control_restart_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 99.371322
-[0] The maximum resident set size (KB)                   = 597296
+[0] The total amount of wall time                        = 101.230690
+[0] The maximum resident set size (KB)                   = 593596
 
-Test 033 control_restart_p8 PASS
+Test 031 control_restart_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_decomp_p8
-Checking test 034 control_decomp_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_decomp_p8
+Checking test 032 control_decomp_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1461,15 +1346,15 @@ Checking test 034 control_decomp_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 192.470470
-[0] The maximum resident set size (KB)                   = 840724
+[0] The total amount of wall time                        = 194.185530
+[0] The maximum resident set size (KB)                   = 840484
 
-Test 034 control_decomp_p8 PASS
+Test 032 control_decomp_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_2threads_p8
-Checking test 035 control_2threads_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_2threads_p8
+Checking test 033 control_2threads_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -1511,15 +1396,15 @@ Checking test 035 control_2threads_p8 results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 174.379068
-[0] The maximum resident set size (KB)                   = 921776
+[0] The total amount of wall time                        = 173.580617
+[0] The maximum resident set size (KB)                   = 925176
 
-Test 035 control_2threads_p8 PASS
+Test 033 control_2threads_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_p8_rrtmgp
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_p8_rrtmgp
-Checking test 036 control_p8_rrtmgp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_p8_rrtmgp
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_p8_rrtmgp
+Checking test 034 control_p8_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1565,15 +1450,15 @@ Checking test 036 control_p8_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 232.135246
-[0] The maximum resident set size (KB)                   = 964604
+[0] The total amount of wall time                        = 228.851557
+[0] The maximum resident set size (KB)                   = 963880
 
-Test 036 control_p8_rrtmgp PASS
+Test 034 control_p8_rrtmgp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_control
-Checking test 037 regional_control results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_control
+Checking test 035 regional_control results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1583,58 +1468,58 @@ Checking test 037 regional_control results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 373.816548
-[0] The maximum resident set size (KB)                   = 580056
+[0] The total amount of wall time                        = 377.218414
+[0] The maximum resident set size (KB)                   = 579604
 
-Test 037 regional_control PASS
+Test 035 regional_control PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_restart
-Checking test 038 regional_restart results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_restart
+Checking test 036 regional_restart results ....
  Comparing dynf024.nc .........OK
  Comparing phyf024.nc .........OK
  Comparing PRSLEV.GrbF24 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 204.445818
-[0] The maximum resident set size (KB)                   = 584840
+[0] The total amount of wall time                        = 204.853278
+[0] The maximum resident set size (KB)                   = 583356
 
-Test 038 regional_restart PASS
+Test 036 regional_restart PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_control_2dwrtdecomp
-Checking test 039 regional_control_2dwrtdecomp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_control_2dwrtdecomp
+Checking test 037 regional_control_2dwrtdecomp results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf024.nc .........OK
 
-[0] The total amount of wall time                        = 370.901187
-[0] The maximum resident set size (KB)                   = 581988
+[0] The total amount of wall time                        = 370.424513
+[0] The maximum resident set size (KB)                   = 581544
 
-Test 039 regional_control_2dwrtdecomp PASS
+Test 037 regional_control_2dwrtdecomp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_noquilt
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_noquilt
-Checking test 040 regional_noquilt results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_noquilt
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_noquilt
+Checking test 038 regional_noquilt 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                        = 400.748700
-[0] The maximum resident set size (KB)                   = 608564
+[0] The total amount of wall time                        = 399.024704
+[0] The maximum resident set size (KB)                   = 612024
 
-Test 040 regional_noquilt PASS
+Test 038 regional_noquilt PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_2threads
-Checking test 041 regional_2threads results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_2threads
+Checking test 039 regional_2threads results ....
  Comparing dynf000.nc .........OK
  Comparing dynf024.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1644,29 +1529,29 @@ Checking test 041 regional_2threads results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 219.261752
-[0] The maximum resident set size (KB)                   = 582096
+[0] The total amount of wall time                        = 219.480225
+[0] The maximum resident set size (KB)                   = 581312
 
-Test 041 regional_2threads PASS
+Test 039 regional_2threads PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_netcdf_parallel
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_netcdf_parallel
-Checking test 042 regional_netcdf_parallel results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_netcdf_parallel
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_netcdf_parallel
+Checking test 040 regional_netcdf_parallel results ....
  Comparing dynf000.nc ............ALT CHECK......OK
  Comparing dynf024.nc ............ALT CHECK......OK
- Comparing phyf000.nc ............ALT CHECK......OK
+ Comparing phyf000.nc .........OK
  Comparing phyf024.nc ............ALT CHECK......OK
 
-[0] The total amount of wall time                        = 376.393029
-[0] The maximum resident set size (KB)                   = 578748
+[0] The total amount of wall time                        = 374.167683
+[0] The maximum resident set size (KB)                   = 579856
 
-Test 042 regional_netcdf_parallel PASS
+Test 040 regional_netcdf_parallel PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_3km
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_3km
-Checking test 043 regional_3km results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_3km
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_3km
+Checking test 041 regional_3km results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1676,15 +1561,15 @@ Checking test 043 regional_3km results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-[0] The total amount of wall time                        = 308.157096
-[0] The maximum resident set size (KB)                   = 604864
+[0] The total amount of wall time                        = 312.056226
+[0] The maximum resident set size (KB)                   = 607968
 
-Test 043 regional_3km PASS
+Test 041 regional_3km PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_control
-Checking test 044 rap_control results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_control
+Checking test 042 rap_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1730,15 +1615,15 @@ Checking test 044 rap_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 466.092359
-[0] The maximum resident set size (KB)                   = 837332
+[0] The total amount of wall time                        = 472.277655
+[0] The maximum resident set size (KB)                   = 835496
 
-Test 044 rap_control PASS
+Test 042 rap_control PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_rrtmgp
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_rrtmgp
-Checking test 045 rap_rrtmgp results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_rrtmgp
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_rrtmgp
+Checking test 043 rap_rrtmgp results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1784,15 +1669,15 @@ Checking test 045 rap_rrtmgp results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 509.004851
-[0] The maximum resident set size (KB)                   = 948948
+[0] The total amount of wall time                        = 520.259524
+[0] The maximum resident set size (KB)                   = 948152
 
-Test 045 rap_rrtmgp PASS
+Test 043 rap_rrtmgp PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/regional_spp_sppt_shum_skeb
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_spp_sppt_shum_skeb
-Checking test 046 regional_spp_sppt_shum_skeb results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/regional_spp_sppt_shum_skeb
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_spp_sppt_shum_skeb
+Checking test 044 regional_spp_sppt_shum_skeb results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
@@ -1802,15 +1687,15 @@ Checking test 046 regional_spp_sppt_shum_skeb results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-[0] The total amount of wall time                        = 259.943226
-[0] The maximum resident set size (KB)                   = 941596
+[0] The total amount of wall time                        = 264.048382
+[0] The maximum resident set size (KB)                   = 942784
 
-Test 046 regional_spp_sppt_shum_skeb PASS
+Test 044 regional_spp_sppt_shum_skeb PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_2threads
-Checking test 047 rap_2threads results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_2threads
+Checking test 045 rap_2threads results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1856,15 +1741,15 @@ Checking test 047 rap_2threads results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 441.173331
-[0] The maximum resident set size (KB)                   = 907516
+[0] The total amount of wall time                        = 443.928800
+[0] The maximum resident set size (KB)                   = 901804
 
-Test 047 rap_2threads PASS
+Test 045 rap_2threads PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_restart
-Checking test 048 rap_restart results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_restart
+Checking test 046 rap_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -1902,15 +1787,15 @@ Checking test 048 rap_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 237.248832
-[0] The maximum resident set size (KB)                   = 591316
+[0] The total amount of wall time                        = 237.294315
+[0] The maximum resident set size (KB)                   = 589144
 
-Test 048 rap_restart PASS
+Test 046 rap_restart PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_sfcdiff
-Checking test 049 rap_sfcdiff results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_sfcdiff
+Checking test 047 rap_sfcdiff results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1956,15 +1841,15 @@ Checking test 049 rap_sfcdiff results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 467.212109
-[0] The maximum resident set size (KB)                   = 839848
+[0] The total amount of wall time                        = 477.708309
+[0] The maximum resident set size (KB)                   = 840252
 
-Test 049 rap_sfcdiff PASS
+Test 047 rap_sfcdiff PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_sfcdiff_restart
-Checking test 050 rap_sfcdiff_restart results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_sfcdiff_restart
+Checking test 048 rap_sfcdiff_restart results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing GFSFLX.GrbF24 .........OK
@@ -2002,15 +1887,15 @@ Checking test 050 rap_sfcdiff_restart results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 236.622654
-[0] The maximum resident set size (KB)                   = 592716
+[0] The total amount of wall time                        = 243.251450
+[0] The maximum resident set size (KB)                   = 594104
 
-Test 050 rap_sfcdiff_restart PASS
+Test 048 rap_sfcdiff_restart PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hrrr_control
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hrrr_control
-Checking test 051 hrrr_control results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hrrr_control
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hrrr_control
+Checking test 049 hrrr_control results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2056,15 +1941,15 @@ Checking test 051 hrrr_control results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 452.082186
-[0] The maximum resident set size (KB)                   = 832376
+[0] The total amount of wall time                        = 446.848806
+[0] The maximum resident set size (KB)                   = 834152
 
-Test 051 hrrr_control PASS
+Test 049 hrrr_control PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1beta
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_v1beta
-Checking test 052 rrfs_v1beta results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1beta
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_v1beta
+Checking test 050 rrfs_v1beta results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2110,15 +1995,15 @@ Checking test 052 rrfs_v1beta results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 459.796935
-[0] The maximum resident set size (KB)                   = 836528
+[0] The total amount of wall time                        = 463.946011
+[0] The maximum resident set size (KB)                   = 833312
 
-Test 052 rrfs_v1beta PASS
+Test 050 rrfs_v1beta PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1nssl
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_v1nssl
-Checking test 053 rrfs_v1nssl results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1nssl
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_v1nssl
+Checking test 051 rrfs_v1nssl results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2132,15 +2017,15 @@ Checking test 053 rrfs_v1nssl results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 534.870916
-[0] The maximum resident set size (KB)                   = 522976
+[0] The total amount of wall time                        = 522.763723
+[0] The maximum resident set size (KB)                   = 523000
 
-Test 053 rrfs_v1nssl PASS
+Test 051 rrfs_v1nssl PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1nssl_nohailnoccn
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_v1nssl_nohailnoccn
-Checking test 054 rrfs_v1nssl_nohailnoccn results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1nssl_nohailnoccn
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_v1nssl_nohailnoccn
+Checking test 052 rrfs_v1nssl_nohailnoccn results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2154,15 +2039,15 @@ Checking test 054 rrfs_v1nssl_nohailnoccn results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 507.339768
-[0] The maximum resident set size (KB)                   = 514332
+[0] The total amount of wall time                        = 513.636626
+[0] The maximum resident set size (KB)                   = 511860
 
-Test 054 rrfs_v1nssl_nohailnoccn PASS
+Test 052 rrfs_v1nssl_nohailnoccn PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_conus13km_hrrr_warm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_conus13km_hrrr_warm
-Checking test 055 rrfs_conus13km_hrrr_warm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_conus13km_hrrr_warm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_conus13km_hrrr_warm
+Checking test 053 rrfs_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2170,15 +2055,15 @@ Checking test 055 rrfs_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-[0] The total amount of wall time                        = 201.495122
-[0] The maximum resident set size (KB)                   = 667300
+[0] The total amount of wall time                        = 200.823274
+[0] The maximum resident set size (KB)                   = 663700
 
-Test 055 rrfs_conus13km_hrrr_warm PASS
+Test 053 rrfs_conus13km_hrrr_warm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_conus13km_radar_tten_warm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_conus13km_radar_tten_warm
-Checking test 056 rrfs_conus13km_radar_tten_warm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_conus13km_radar_tten_warm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_conus13km_radar_tten_warm
+Checking test 054 rrfs_conus13km_radar_tten_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2186,15 +2071,15 @@ Checking test 056 rrfs_conus13km_radar_tten_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-[0] The total amount of wall time                        = 202.137815
-[0] The maximum resident set size (KB)                   = 669176
+[0] The total amount of wall time                        = 205.177194
+[0] The maximum resident set size (KB)                   = 667668
 
-Test 056 rrfs_conus13km_radar_tten_warm PASS
+Test 054 rrfs_conus13km_radar_tten_warm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_smoke_conus13km_hrrr_warm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_smoke_conus13km_hrrr_warm
-Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_smoke_conus13km_hrrr_warm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_smoke_conus13km_hrrr_warm
+Checking test 055 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing sfcf002.nc .........OK
@@ -2202,15 +2087,15 @@ Checking test 057 rrfs_smoke_conus13km_hrrr_warm results ....
  Comparing atmf001.nc .........OK
  Comparing atmf002.nc .........OK
 
-[0] The total amount of wall time                        = 216.731165
-[0] The maximum resident set size (KB)                   = 676600
+[0] The total amount of wall time                        = 218.166119
+[0] The maximum resident set size (KB)                   = 680020
 
-Test 057 rrfs_smoke_conus13km_hrrr_warm PASS
+Test 055 rrfs_smoke_conus13km_hrrr_warm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmg
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_csawmg
-Checking test 058 control_csawmg results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmg
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_csawmg
+Checking test 056 control_csawmg results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2220,15 +2105,15 @@ Checking test 058 control_csawmg results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 374.122022
-[0] The maximum resident set size (KB)                   = 526088
+[0] The total amount of wall time                        = 379.838578
+[0] The maximum resident set size (KB)                   = 526728
 
-Test 058 control_csawmg PASS
+Test 056 control_csawmg PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmgt
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_csawmgt
-Checking test 059 control_csawmgt results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmgt
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_csawmgt
+Checking test 057 control_csawmgt results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2238,15 +2123,15 @@ Checking test 059 control_csawmgt results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 370.146531
-[0] The maximum resident set size (KB)                   = 525992
+[0] The total amount of wall time                        = 376.714507
+[0] The maximum resident set size (KB)                   = 523412
 
-Test 059 control_csawmgt PASS
+Test 057 control_csawmgt PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_flake
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_flake
-Checking test 060 control_flake results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_flake
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_flake
+Checking test 058 control_flake results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2256,15 +2141,15 @@ Checking test 060 control_flake results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 257.016199
-[0] The maximum resident set size (KB)                   = 533384
+[0] The total amount of wall time                        = 262.535187
+[0] The maximum resident set size (KB)                   = 530740
 
-Test 060 control_flake PASS
+Test 058 control_flake PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_ras
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_ras
-Checking test 061 control_ras results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_ras
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_ras
+Checking test 059 control_ras results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2274,15 +2159,15 @@ Checking test 061 control_ras results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 197.755254
-[0] The maximum resident set size (KB)                   = 494532
+[0] The total amount of wall time                        = 201.196330
+[0] The maximum resident set size (KB)                   = 494404
 
-Test 061 control_ras PASS
+Test 059 control_ras PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson
-Checking test 062 control_thompson results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson
+Checking test 060 control_thompson results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2292,15 +2177,15 @@ Checking test 062 control_thompson results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 266.597222
-[0] The maximum resident set size (KB)                   = 848092
+[0] The total amount of wall time                        = 263.894971
+[0] The maximum resident set size (KB)                   = 850736
 
-Test 062 control_thompson PASS
+Test 060 control_thompson PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_no_aero
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson_no_aero
-Checking test 063 control_thompson_no_aero results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_no_aero
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson_no_aero
+Checking test 061 control_thompson_no_aero results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -2310,55 +2195,55 @@ Checking test 063 control_thompson_no_aero results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-[0] The total amount of wall time                        = 256.176245
-[0] The maximum resident set size (KB)                   = 841004
+[0] The total amount of wall time                        = 252.047207
+[0] The maximum resident set size (KB)                   = 841820
 
-Test 063 control_thompson_no_aero PASS
+Test 061 control_thompson_no_aero PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wam
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_wam
-Checking test 064 control_wam results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wam
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_wam
+Checking test 062 control_wam results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-[0] The total amount of wall time                        = 119.209703
-[0] The maximum resident set size (KB)                   = 229660
+[0] The total amount of wall time                        = 129.660038
+[0] The maximum resident set size (KB)                   = 228628
 
-Test 064 control_wam PASS
+Test 062 control_wam PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_debug
-Checking test 065 control_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_debug
+Checking test 063 control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 167.325230
-[0] The maximum resident set size (KB)                   = 627956
+[0] The total amount of wall time                        = 167.448193
+[0] The maximum resident set size (KB)                   = 627152
 
-Test 065 control_debug PASS
+Test 063 control_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_2threads_debug
-Checking test 066 control_2threads_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_2threads_debug
+Checking test 064 control_2threads_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 157.243346
-[0] The maximum resident set size (KB)                   = 680924
+[0] The total amount of wall time                        = 156.113703
+[0] The maximum resident set size (KB)                   = 678924
 
-Test 066 control_2threads_debug PASS
+Test 064 control_2threads_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_CubedSphereGrid_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_CubedSphereGrid_debug
-Checking test 067 control_CubedSphereGrid_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_CubedSphereGrid_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_CubedSphereGrid_debug
+Checking test 065 control_CubedSphereGrid_debug results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
  Comparing sfcf000.tile3.nc .........OK
@@ -2384,724 +2269,740 @@ Checking test 067 control_CubedSphereGrid_debug results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 181.526759
-[0] The maximum resident set size (KB)                   = 628196
+[0] The total amount of wall time                        = 181.486905
+[0] The maximum resident set size (KB)                   = 632780
 
-Test 067 control_CubedSphereGrid_debug PASS
+Test 065 control_CubedSphereGrid_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wrtGauss_netcdf_parallel_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_wrtGauss_netcdf_parallel_debug
-Checking test 068 control_wrtGauss_netcdf_parallel_debug results ....
- Comparing sfcf000.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wrtGauss_netcdf_parallel_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_wrtGauss_netcdf_parallel_debug
+Checking test 066 control_wrtGauss_netcdf_parallel_debug results ....
+ Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
- Comparing atmf000.nc ............ALT CHECK......OK
- Comparing atmf001.nc ............ALT CHECK......OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf001.nc .........OK
+
+[0] The total amount of wall time                        = 170.117337
+[0] The maximum resident set size (KB)                   = 629952
 
-[0] The total amount of wall time                        = 170.938963
-[0] The maximum resident set size (KB)                   = 628776
+Test 066 control_wrtGauss_netcdf_parallel_debug PASS
 
-Test 068 control_wrtGauss_netcdf_parallel_debug PASS
 
-Test 069 control_stochy_debug FAIL
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_stochy_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_stochy_debug
+Checking test 067 control_stochy_debug results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf001.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf001.nc .........OK
+
+[0] The total amount of wall time                        = 191.382077
+[0] The maximum resident set size (KB)                   = 637104
 
+Test 067 control_stochy_debug PASS
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_lndp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_lndp_debug
-Checking test 070 control_lndp_debug results ....
+
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_lndp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_lndp_debug
+Checking test 068 control_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 171.315423
-[0] The maximum resident set size (KB)                   = 637820
+[0] The total amount of wall time                        = 171.696924
+[0] The maximum resident set size (KB)                   = 637280
 
-Test 070 control_lndp_debug PASS
+Test 068 control_lndp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmg_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_csawmg_debug
-Checking test 071 control_csawmg_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmg_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_csawmg_debug
+Checking test 069 control_csawmg_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 269.249977
-[0] The maximum resident set size (KB)                   = 664444
+[0] The total amount of wall time                        = 271.383969
+[0] The maximum resident set size (KB)                   = 661884
 
-Test 071 control_csawmg_debug PASS
+Test 069 control_csawmg_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_csawmgt_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_csawmgt_debug
-Checking test 072 control_csawmgt_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_csawmgt_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_csawmgt_debug
+Checking test 070 control_csawmgt_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 265.098399
-[0] The maximum resident set size (KB)                   = 668416
+[0] The total amount of wall time                        = 265.203339
+[0] The maximum resident set size (KB)                   = 667020
 
-Test 072 control_csawmgt_debug PASS
+Test 070 control_csawmgt_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_ras_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_ras_debug
-Checking test 073 control_ras_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_ras_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_ras_debug
+Checking test 071 control_ras_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 173.141387
-[0] The maximum resident set size (KB)                   = 643700
+[0] The total amount of wall time                        = 173.596723
+[0] The maximum resident set size (KB)                   = 644648
 
-Test 073 control_ras_debug PASS
+Test 071 control_ras_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_diag_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_diag_debug
-Checking test 074 control_diag_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_diag_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_diag_debug
+Checking test 072 control_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 175.851230
-[0] The maximum resident set size (KB)                   = 685108
+[0] The total amount of wall time                        = 176.451792
+[0] The maximum resident set size (KB)                   = 689428
 
-Test 074 control_diag_debug PASS
+Test 072 control_diag_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_debug_p8
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_debug_p8
-Checking test 075 control_debug_p8 results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_debug_p8
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_debug_p8
+Checking test 073 control_debug_p8 results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 189.844859
-[0] The maximum resident set size (KB)                   = 1012888
+[0] The total amount of wall time                        = 190.770812
+[0] The maximum resident set size (KB)                   = 1014372
 
-Test 075 control_debug_p8 PASS
+Test 073 control_debug_p8 PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson_debug
-Checking test 076 control_thompson_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson_debug
+Checking test 074 control_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 198.026766
-[0] The maximum resident set size (KB)                   = 995920
+[0] The total amount of wall time                        = 199.025068
+[0] The maximum resident set size (KB)                   = 991420
 
-Test 076 control_thompson_debug PASS
+Test 074 control_thompson_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_no_aero_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson_no_aero_debug
-Checking test 077 control_thompson_no_aero_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_no_aero_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson_no_aero_debug
+Checking test 075 control_thompson_no_aero_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 190.351130
-[0] The maximum resident set size (KB)                   = 986320
+[0] The total amount of wall time                        = 190.921698
+[0] The maximum resident set size (KB)                   = 985892
 
-Test 077 control_thompson_no_aero_debug PASS
+Test 075 control_thompson_no_aero_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_debug_extdiag
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson_extdiag_debug
-Checking test 078 control_thompson_extdiag_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_debug_extdiag
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson_extdiag_debug
+Checking test 076 control_thompson_extdiag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 207.111512
-[0] The maximum resident set size (KB)                   = 1019604
+[0] The total amount of wall time                        = 208.041661
+[0] The maximum resident set size (KB)                   = 1018260
 
-Test 078 control_thompson_extdiag_debug PASS
+Test 076 control_thompson_extdiag_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_thompson_progcld_thompson_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_thompson_progcld_thompson_debug
-Checking test 079 control_thompson_progcld_thompson_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_thompson_progcld_thompson_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_thompson_progcld_thompson_debug
+Checking test 077 control_thompson_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 198.620527
-[0] The maximum resident set size (KB)                   = 991308
+[0] The total amount of wall time                        = 197.617263
+[0] The maximum resident set size (KB)                   = 995580
 
-Test 079 control_thompson_progcld_thompson_debug PASS
+Test 077 control_thompson_progcld_thompson_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/fv3_regional_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/regional_debug
-Checking test 080 regional_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/fv3_regional_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/regional_debug
+Checking test 078 regional_debug results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf001.nc .........OK
 
-[0] The total amount of wall time                        = 282.983022
-[0] The maximum resident set size (KB)                   = 607844
+[0] The total amount of wall time                        = 283.329152
+[0] The maximum resident set size (KB)                   = 610060
 
-Test 080 regional_debug PASS
+Test 078 regional_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_control_debug
-Checking test 081 rap_control_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_control_debug
+Checking test 079 rap_control_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 308.202368
-[0] The maximum resident set size (KB)                   = 998940
+[0] The total amount of wall time                        = 306.330004
+[0] The maximum resident set size (KB)                   = 997972
 
-Test 081 rap_control_debug PASS
+Test 079 rap_control_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_control_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_unified_drag_suite_debug
-Checking test 082 rap_unified_drag_suite_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_control_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_unified_drag_suite_debug
+Checking test 080 rap_unified_drag_suite_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 306.617776
-[0] The maximum resident set size (KB)                   = 997176
+[0] The total amount of wall time                        = 307.095094
+[0] The maximum resident set size (KB)                   = 999244
 
-Test 082 rap_unified_drag_suite_debug PASS
+Test 080 rap_unified_drag_suite_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_diag_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_diag_debug
-Checking test 083 rap_diag_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_diag_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_diag_debug
+Checking test 081 rap_diag_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 322.406374
-[0] The maximum resident set size (KB)                   = 1081240
+[0] The total amount of wall time                        = 323.671594
+[0] The maximum resident set size (KB)                   = 1081188
 
-Test 083 rap_diag_debug PASS
+Test 081 rap_diag_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_cires_ugwp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_cires_ugwp_debug
-Checking test 084 rap_cires_ugwp_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_cires_ugwp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_cires_ugwp_debug
+Checking test 082 rap_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 313.288201
-[0] The maximum resident set size (KB)                   = 997164
+[0] The total amount of wall time                        = 313.856826
+[0] The maximum resident set size (KB)                   = 999732
 
-Test 084 rap_cires_ugwp_debug PASS
+Test 082 rap_cires_ugwp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_cires_ugwp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_unified_ugwp_debug
-Checking test 085 rap_unified_ugwp_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_cires_ugwp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_unified_ugwp_debug
+Checking test 083 rap_unified_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 312.202809
-[0] The maximum resident set size (KB)                   = 998928
+[0] The total amount of wall time                        = 314.220847
+[0] The maximum resident set size (KB)                   = 1000604
 
-Test 085 rap_unified_ugwp_debug PASS
+Test 083 rap_unified_ugwp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_lndp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_lndp_debug
-Checking test 086 rap_lndp_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_lndp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_lndp_debug
+Checking test 084 rap_lndp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 309.183077
-[0] The maximum resident set size (KB)                   = 999284
+[0] The total amount of wall time                        = 310.199097
+[0] The maximum resident set size (KB)                   = 1001968
 
-Test 086 rap_lndp_debug PASS
+Test 084 rap_lndp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_flake_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_flake_debug
-Checking test 087 rap_flake_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_flake_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_flake_debug
+Checking test 085 rap_flake_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 306.107562
-[0] The maximum resident set size (KB)                   = 998448
+[0] The total amount of wall time                        = 306.517153
+[0] The maximum resident set size (KB)                   = 997320
 
-Test 087 rap_flake_debug PASS
+Test 085 rap_flake_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_progcld_thompson_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_progcld_thompson_debug
-Checking test 088 rap_progcld_thompson_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_progcld_thompson_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_progcld_thompson_debug
+Checking test 086 rap_progcld_thompson_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 307.739151
-[0] The maximum resident set size (KB)                   = 999832
+[0] The total amount of wall time                        = 307.709236
+[0] The maximum resident set size (KB)                   = 1001136
 
-Test 088 rap_progcld_thompson_debug PASS
+Test 086 rap_progcld_thompson_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_noah_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_noah_debug
-Checking test 089 rap_noah_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_noah_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_noah_debug
+Checking test 087 rap_noah_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 304.031088
-[0] The maximum resident set size (KB)                   = 996988
+[0] The total amount of wall time                        = 304.002552
+[0] The maximum resident set size (KB)                   = 997780
 
-Test 089 rap_noah_debug PASS
+Test 087 rap_noah_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_rrtmgp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_rrtmgp_debug
-Checking test 090 rap_rrtmgp_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_rrtmgp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_rrtmgp_debug
+Checking test 088 rap_rrtmgp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 520.652467
-[0] The maximum resident set size (KB)                   = 1116220
+[0] The total amount of wall time                        = 521.207291
+[0] The maximum resident set size (KB)                   = 1111268
 
-Test 090 rap_rrtmgp_debug PASS
+Test 088 rap_rrtmgp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_sfcdiff_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_sfcdiff_debug
-Checking test 091 rap_sfcdiff_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_sfcdiff_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_sfcdiff_debug
+Checking test 089 rap_sfcdiff_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 308.263265
-[0] The maximum resident set size (KB)                   = 1000772
+[0] The total amount of wall time                        = 307.735502
+[0] The maximum resident set size (KB)                   = 1002332
 
-Test 091 rap_sfcdiff_debug PASS
+Test 089 rap_sfcdiff_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rap_noah_sfcdiff_cires_ugwp_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rap_noah_sfcdiff_cires_ugwp_debug
-Checking test 092 rap_noah_sfcdiff_cires_ugwp_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rap_noah_sfcdiff_cires_ugwp_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rap_noah_sfcdiff_cires_ugwp_debug
+Checking test 090 rap_noah_sfcdiff_cires_ugwp_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 511.987682
-[0] The maximum resident set size (KB)                   = 999512
+[0] The total amount of wall time                        = 510.205895
+[0] The maximum resident set size (KB)                   = 1001536
 
-Test 092 rap_noah_sfcdiff_cires_ugwp_debug PASS
+Test 090 rap_noah_sfcdiff_cires_ugwp_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/rrfs_v1beta_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/rrfs_v1beta_debug
-Checking test 093 rrfs_v1beta_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/rrfs_v1beta_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/rrfs_v1beta_debug
+Checking test 091 rrfs_v1beta_debug results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-[0] The total amount of wall time                        = 305.141259
-[0] The maximum resident set size (KB)                   = 997196
+[0] The total amount of wall time                        = 304.541068
+[0] The maximum resident set size (KB)                   = 993756
 
-Test 093 rrfs_v1beta_debug PASS
+Test 091 rrfs_v1beta_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_wam_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_wam_debug
-Checking test 094 control_wam_debug results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_wam_debug
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_wam_debug
+Checking test 092 control_wam_debug results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-[0] The total amount of wall time                        = 320.809442
-[0] The maximum resident set size (KB)                   = 255596
+[0] The total amount of wall time                        = 322.188242
+[0] The maximum resident set size (KB)                   = 255044
 
-Test 094 control_wam_debug PASS
+Test 092 control_wam_debug PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_atm
-Checking test 095 hafs_regional_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
- Comparing sfcf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_atm
+Checking test 093 hafs_regional_atm results ....
+ Comparing atmf006.nc .........OK
+ Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-[0] The total amount of wall time                        = 289.823351
-[0] The maximum resident set size (KB)                   = 717312
+[0] The total amount of wall time                        = 284.421149
+[0] The maximum resident set size (KB)                   = 712184
 
-Test 095 hafs_regional_atm PASS
+Test 093 hafs_regional_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_thompson_gfdlsf
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_atm_thompson_gfdlsf
-Checking test 096 hafs_regional_atm_thompson_gfdlsf results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_thompson_gfdlsf
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_atm_thompson_gfdlsf
+Checking test 094 hafs_regional_atm_thompson_gfdlsf results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-[0] The total amount of wall time                        = 381.376165
-[0] The maximum resident set size (KB)                   = 1078708
+[0] The total amount of wall time                        = 374.228416
+[0] The maximum resident set size (KB)                   = 1072716
 
-Test 096 hafs_regional_atm_thompson_gfdlsf PASS
+Test 094 hafs_regional_atm_thompson_gfdlsf PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_ocn
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_atm_ocn
-Checking test 097 hafs_regional_atm_ocn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_ocn
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_atm_ocn
+Checking test 095 hafs_regional_atm_ocn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-[0] The total amount of wall time                        = 436.227679
-[0] The maximum resident set size (KB)                   = 747328
+[0] The total amount of wall time                        = 428.603892
+[0] The maximum resident set size (KB)                   = 752876
 
-Test 097 hafs_regional_atm_ocn PASS
+Test 095 hafs_regional_atm_ocn PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_wav
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_atm_wav
-Checking test 098 hafs_regional_atm_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_wav
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_atm_wav
+Checking test 096 hafs_regional_atm_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-[0] The total amount of wall time                        = 978.988859
-[0] The maximum resident set size (KB)                   = 736520
+[0] The total amount of wall time                        = 982.762830
+[0] The maximum resident set size (KB)                   = 778280
 
-Test 098 hafs_regional_atm_wav PASS
+Test 096 hafs_regional_atm_wav PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_atm_ocn_wav
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_atm_ocn_wav
-Checking test 099 hafs_regional_atm_ocn_wav results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_atm_ocn_wav
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_atm_ocn_wav
+Checking test 097 hafs_regional_atm_ocn_wav results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing archv.2019_241_06.a .........OK
  Comparing archs.2019_241_06.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
+ Comparing 20190829.060000.restart.ww3 .........OK
+ Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-[0] The total amount of wall time                        = 1087.035893
-[0] The maximum resident set size (KB)                   = 760184
+[0] The total amount of wall time                        = 1100.464372
+[0] The maximum resident set size (KB)                   = 801808
 
-Test 099 hafs_regional_atm_ocn_wav PASS
+Test 097 hafs_regional_atm_ocn_wav PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_1nest_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_1nest_atm
-Checking test 100 hafs_regional_1nest_atm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_1nest_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_1nest_atm
+Checking test 098 hafs_regional_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-[0] The total amount of wall time                        = 416.444799
-[0] The maximum resident set size (KB)                   = 321132
+[0] The total amount of wall time                        = 414.129955
+[0] The maximum resident set size (KB)                   = 321028
 
-Test 100 hafs_regional_1nest_atm PASS
+Test 098 hafs_regional_1nest_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_telescopic_2nests_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_telescopic_2nests_atm
-Checking test 101 hafs_regional_telescopic_2nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_telescopic_2nests_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_telescopic_2nests_atm
+Checking test 099 hafs_regional_telescopic_2nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
- Comparing sfc.nest03.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest03.f006.nc .........OK
 
-[0] The total amount of wall time                        = 459.409304
-[0] The maximum resident set size (KB)                   = 327792
+[0] The total amount of wall time                        = 464.743297
+[0] The maximum resident set size (KB)                   = 327208
 
-Test 101 hafs_regional_telescopic_2nests_atm PASS
+Test 099 hafs_regional_telescopic_2nests_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_global_1nest_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_global_1nest_atm
-Checking test 102 hafs_global_1nest_atm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_global_1nest_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_global_1nest_atm
+Checking test 100 hafs_global_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-[0] The total amount of wall time                        = 189.085882
-[0] The maximum resident set size (KB)                   = 207456
+[0] The total amount of wall time                        = 186.678895
+[0] The maximum resident set size (KB)                   = 206868
 
-Test 102 hafs_global_1nest_atm PASS
+Test 100 hafs_global_1nest_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_global_multiple_4nests_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_global_multiple_4nests_atm
-Checking test 103 hafs_global_multiple_4nests_atm results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_global_multiple_4nests_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_global_multiple_4nests_atm
+Checking test 101 hafs_global_multiple_4nests_atm results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing sfc.nest04.f006.nc .........OK
  Comparing atm.nest05.f006.nc .........OK
- Comparing sfc.nest05.f006.nc ............ALT CHECK......OK
+ Comparing sfc.nest05.f006.nc .........OK
 
-[0] The total amount of wall time                        = 569.006263
-[0] The maximum resident set size (KB)                   = 268776
+[0] The total amount of wall time                        = 572.448112
+[0] The maximum resident set size (KB)                   = 279616
 
-Test 103 hafs_global_multiple_4nests_atm PASS
+Test 101 hafs_global_multiple_4nests_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_specified_moving_1nest_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_specified_moving_1nest_atm
-Checking test 104 hafs_regional_specified_moving_1nest_atm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_specified_moving_1nest_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_specified_moving_1nest_atm
+Checking test 102 hafs_regional_specified_moving_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-[0] The total amount of wall time                        = 251.111228
-[0] The maximum resident set size (KB)                   = 321300
+[0] The total amount of wall time                        = 252.014374
+[0] The maximum resident set size (KB)                   = 322856
 
-Test 104 hafs_regional_specified_moving_1nest_atm PASS
+Test 102 hafs_regional_specified_moving_1nest_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_storm_following_1nest_atm
-Checking test 105 hafs_regional_storm_following_1nest_atm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_storm_following_1nest_atm
+Checking test 103 hafs_regional_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-[0] The total amount of wall time                        = 239.411833
-[0] The maximum resident set size (KB)                   = 323184
+[0] The total amount of wall time                        = 239.701769
+[0] The maximum resident set size (KB)                   = 325752
 
-Test 105 hafs_regional_storm_following_1nest_atm PASS
+Test 103 hafs_regional_storm_following_1nest_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm_ocn
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_storm_following_1nest_atm_ocn
-Checking test 106 hafs_regional_storm_following_1nest_atm_ocn results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm_ocn
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_storm_following_1nest_atm_ocn
+Checking test 104 hafs_regional_storm_following_1nest_atm_ocn results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-[0] The total amount of wall time                        = 272.393293
-[0] The maximum resident set size (KB)                   = 349812
+[0] The total amount of wall time                        = 270.535400
+[0] The maximum resident set size (KB)                   = 350148
 
-Test 106 hafs_regional_storm_following_1nest_atm_ocn PASS
+Test 104 hafs_regional_storm_following_1nest_atm_ocn PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_storm_following_1nest_atm_ocn_wav
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_storm_following_1nest_atm_ocn_wav
-Checking test 107 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_storm_following_1nest_atm_ocn_wav
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_storm_following_1nest_atm_ocn_wav
+Checking test 105 hafs_regional_storm_following_1nest_atm_ocn_wav results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
  Comparing out_grd.ww3 .........OK
  Comparing out_pnt.ww3 .........OK
 
-[0] The total amount of wall time                        = 675.329226
-[0] The maximum resident set size (KB)                   = 371536
+[0] The total amount of wall time                        = 701.920732
+[0] The maximum resident set size (KB)                   = 418820
 
-Test 107 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
+Test 105 hafs_regional_storm_following_1nest_atm_ocn_wav PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_global_storm_following_1nest_atm
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_global_storm_following_1nest_atm
-Checking test 108 hafs_global_storm_following_1nest_atm results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_global_storm_following_1nest_atm
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_global_storm_following_1nest_atm
+Checking test 106 hafs_global_storm_following_1nest_atm results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
- Comparing atm.nest02.f006.nc ............ALT CHECK......OK
- Comparing sfc.nest02.f006.nc ............ALT CHECK......OK
+ Comparing atm.nest02.f006.nc .........OK
+ Comparing sfc.nest02.f006.nc .........OK
 
-[0] The total amount of wall time                        = 77.785763
-[0] The maximum resident set size (KB)                   = 225944
+[0] The total amount of wall time                        = 78.659765
+[0] The maximum resident set size (KB)                   = 229232
 
-Test 108 hafs_global_storm_following_1nest_atm PASS
+Test 106 hafs_global_storm_following_1nest_atm PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_docn
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_docn
-Checking test 109 hafs_regional_docn results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_docn
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_docn
+Checking test 107 hafs_regional_docn results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-[0] The total amount of wall time                        = 427.271885
-[0] The maximum resident set size (KB)                   = 765632
+[0] The total amount of wall time                        = 432.894239
+[0] The maximum resident set size (KB)                   = 758084
 
-Test 109 hafs_regional_docn PASS
+Test 107 hafs_regional_docn PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_docn_oisst
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_docn_oisst
-Checking test 110 hafs_regional_docn_oisst results ....
- Comparing atmf006.nc ............ALT CHECK......OK
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_docn_oisst
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_docn_oisst
+Checking test 108 hafs_regional_docn_oisst results ....
+ Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-[0] The total amount of wall time                        = 429.032833
-[0] The maximum resident set size (KB)                   = 741952
+[0] The total amount of wall time                        = 434.011600
+[0] The maximum resident set size (KB)                   = 739972
 
-Test 110 hafs_regional_docn_oisst PASS
+Test 108 hafs_regional_docn_oisst PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/hafs_regional_datm_cdeps
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/hafs_regional_datm_cdeps
-Checking test 111 hafs_regional_datm_cdeps results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/hafs_regional_datm_cdeps
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/hafs_regional_datm_cdeps
+Checking test 109 hafs_regional_datm_cdeps results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-[0] The total amount of wall time                        = 1094.559707
-[0] The maximum resident set size (KB)                   = 889708
+[0] The total amount of wall time                        = 1094.253416
+[0] The maximum resident set size (KB)                   = 889908
 
-Test 111 hafs_regional_datm_cdeps PASS
+Test 109 hafs_regional_datm_cdeps PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_control_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_control_cfsr
-Checking test 112 datm_cdeps_control_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_control_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_control_cfsr
+Checking test 110 datm_cdeps_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                        = 173.058044
-[0] The maximum resident set size (KB)                   = 722548
+[0] The total amount of wall time                        = 175.314367
+[0] The maximum resident set size (KB)                   = 725256
 
-Test 112 datm_cdeps_control_cfsr PASS
+Test 110 datm_cdeps_control_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_control_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_restart_cfsr
-Checking test 113 datm_cdeps_restart_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_control_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_restart_cfsr
+Checking test 111 datm_cdeps_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                        = 120.753041
-[0] The maximum resident set size (KB)                   = 721956
+[0] The total amount of wall time                        = 116.230018
+[0] The maximum resident set size (KB)                   = 724524
 
-Test 113 datm_cdeps_restart_cfsr PASS
+Test 111 datm_cdeps_restart_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_control_gefs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_control_gefs
-Checking test 114 datm_cdeps_control_gefs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_control_gefs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_control_gefs
+Checking test 112 datm_cdeps_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                        = 168.381417
-[0] The maximum resident set size (KB)                   = 626204
+[0] The total amount of wall time                        = 169.878631
+[0] The maximum resident set size (KB)                   = 625328
 
-Test 114 datm_cdeps_control_gefs PASS
+Test 112 datm_cdeps_control_gefs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_iau_gefs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_iau_gefs
-Checking test 115 datm_cdeps_iau_gefs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_iau_gefs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_iau_gefs
+Checking test 113 datm_cdeps_iau_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                        = 169.631299
-[0] The maximum resident set size (KB)                   = 628392
+[0] The total amount of wall time                        = 177.112436
+[0] The maximum resident set size (KB)                   = 626868
 
-Test 115 datm_cdeps_iau_gefs PASS
+Test 113 datm_cdeps_iau_gefs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_stochy_gefs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_stochy_gefs
-Checking test 116 datm_cdeps_stochy_gefs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_stochy_gefs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_stochy_gefs
+Checking test 114 datm_cdeps_stochy_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                        = 170.550710
-[0] The maximum resident set size (KB)                   = 626548
+[0] The total amount of wall time                        = 170.976467
+[0] The maximum resident set size (KB)                   = 628160
 
-Test 116 datm_cdeps_stochy_gefs PASS
+Test 114 datm_cdeps_stochy_gefs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_bulk_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_bulk_cfsr
-Checking test 117 datm_cdeps_bulk_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_bulk_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_bulk_cfsr
+Checking test 115 datm_cdeps_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                        = 174.066315
-[0] The maximum resident set size (KB)                   = 724404
+[0] The total amount of wall time                        = 174.014819
+[0] The maximum resident set size (KB)                   = 725716
 
-Test 117 datm_cdeps_bulk_cfsr PASS
+Test 115 datm_cdeps_bulk_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_bulk_gefs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_bulk_gefs
-Checking test 118 datm_cdeps_bulk_gefs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_bulk_gefs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_bulk_gefs
+Checking test 116 datm_cdeps_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                        = 167.349844
-[0] The maximum resident set size (KB)                   = 627100
+[0] The total amount of wall time                        = 169.491346
+[0] The maximum resident set size (KB)                   = 625940
 
-Test 118 datm_cdeps_bulk_gefs PASS
+Test 116 datm_cdeps_bulk_gefs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_mx025_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_mx025_cfsr
-Checking test 119 datm_cdeps_mx025_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_mx025_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_mx025_cfsr
+Checking test 117 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3109,15 +3010,15 @@ Checking test 119 datm_cdeps_mx025_cfsr results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-[0] The total amount of wall time                        = 365.992956
-[0] The maximum resident set size (KB)                   = 555696
+[0] The total amount of wall time                        = 343.313299
+[0] The maximum resident set size (KB)                   = 556628
 
-Test 119 datm_cdeps_mx025_cfsr PASS
+Test 117 datm_cdeps_mx025_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_mx025_gefs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_mx025_gefs
-Checking test 120 datm_cdeps_mx025_gefs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_mx025_gefs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_mx025_gefs
+Checking test 118 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/MOM.res_1.nc .........OK
  Comparing RESTART/MOM.res_2.nc .........OK
@@ -3125,65 +3026,65 @@ Checking test 120 datm_cdeps_mx025_gefs results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS.cpl.r.2011-10-01-43200.nc .........OK
 
-[0] The total amount of wall time                        = 358.290067
-[0] The maximum resident set size (KB)                   = 523360
+[0] The total amount of wall time                        = 334.371464
+[0] The maximum resident set size (KB)                   = 520972
 
-Test 120 datm_cdeps_mx025_gefs PASS
+Test 118 datm_cdeps_mx025_gefs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_control_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_multiple_files_cfsr
-Checking test 121 datm_cdeps_multiple_files_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_control_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_multiple_files_cfsr
+Checking test 119 datm_cdeps_multiple_files_cfsr results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
-[0] The total amount of wall time                        = 177.048392
-[0] The maximum resident set size (KB)                   = 723780
+[0] The total amount of wall time                        = 175.101168
+[0] The maximum resident set size (KB)                   = 724064
 
-Test 121 datm_cdeps_multiple_files_cfsr PASS
+Test 119 datm_cdeps_multiple_files_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_3072x1536_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_3072x1536_cfsr
-Checking test 122 datm_cdeps_3072x1536_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_3072x1536_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_3072x1536_cfsr
+Checking test 120 datm_cdeps_3072x1536_cfsr results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
-[0] The total amount of wall time                        = 256.976591
-[0] The maximum resident set size (KB)                   = 1840604
+[0] The total amount of wall time                        = 252.250169
+[0] The maximum resident set size (KB)                   = 1835676
 
-Test 122 datm_cdeps_3072x1536_cfsr PASS
+Test 120 datm_cdeps_3072x1536_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_gfs
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_gfs
-Checking test 123 datm_cdeps_gfs results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_gfs
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_gfs
+Checking test 121 datm_cdeps_gfs results ....
  Comparing RESTART/MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
-[0] The total amount of wall time                        = 261.292479
-[0] The maximum resident set size (KB)                   = 1898032
+[0] The total amount of wall time                        = 254.879675
+[0] The maximum resident set size (KB)                   = 1836236
 
-Test 123 datm_cdeps_gfs PASS
+Test 121 datm_cdeps_gfs PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/datm_cdeps_debug_cfsr
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/datm_cdeps_debug_cfsr
-Checking test 124 datm_cdeps_debug_cfsr results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/datm_cdeps_debug_cfsr
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/datm_cdeps_debug_cfsr
+Checking test 122 datm_cdeps_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                        = 504.809584
-[0] The maximum resident set size (KB)                   = 731728
+[0] The total amount of wall time                        = 504.986946
+[0] The maximum resident set size (KB)                   = 731628
 
-Test 124 datm_cdeps_debug_cfsr PASS
+Test 122 datm_cdeps_debug_cfsr PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_atmwav
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_atmwav
-Checking test 125 control_atmwav results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_atmwav
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_atmwav
+Checking test 123 control_atmwav results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3226,15 +3127,15 @@ Checking test 125 control_atmwav results ....
  Comparing RESTART/sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-[0] The total amount of wall time                        = 97.735780
-[0] The maximum resident set size (KB)                   = 478728
+[0] The total amount of wall time                        = 93.928085
+[0] The maximum resident set size (KB)                   = 472048
 
-Test 125 control_atmwav PASS
+Test 123 control_atmwav PASS
 
 
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_atm_aerosols
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_36326/control_atm_aerosols
-Checking test 126 control_atm_aerosols results ....
+baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220531/control_atm_aerosols
+working dir  = /gpfs/dell2/ptmp/Denise.Worthen/FV3_RT/rt_31222/control_atm_aerosols
+Checking test 124 control_atm_aerosols results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
@@ -3277,36 +3178,12 @@ Checking test 126 control_atm_aerosols results ....
  Comparing RESTART/sfc_data.tile5.nc .........OK
  Comparing RESTART/sfc_data.tile6.nc .........OK
 
-[0] The total amount of wall time                        = 390.647669
-[0] The maximum resident set size (KB)                   = 1046436
-
-Test 126 control_atm_aerosols PASS
-
-FAILED TESTS: 
-Test control_stochy_debug 069 failed in run_test failed 
-
-REGRESSION TEST FAILED
-Fri May 27 20:25:04 UTC 2022
-Elapsed time: 03h:14m:59s. Have a nice day!
-Fri May 27 20:51:08 UTC 2022
-Start Regression test
-
-Compile 001 elapsed time 460 seconds. -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-
-baseline dir = /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/develop-20220519/control_stochy_debug
-working dir  = /gpfs/dell2/ptmp/Jessica.Meixner/FV3_RT/rt_48993/control_stochy_debug
-Checking test 001 control_stochy_debug results ....
- Comparing sfcf000.nc .........OK
- Comparing sfcf001.nc .........OK
- Comparing atmf000.nc .........OK
- Comparing atmf001.nc .........OK
-
-[0] The total amount of wall time                        = 191.207896
-[0] The maximum resident set size (KB)                   = 636540
+[0] The total amount of wall time                        = 390.879156
+[0] The maximum resident set size (KB)                   = 1046920
 
-Test 001 control_stochy_debug PASS
+Test 124 control_atm_aerosols PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri May 27 21:05:07 UTC 2022
-Elapsed time: 00h:14m:00s. Have a nice day!
+Mon May 30 17:14:38 UTC 2022
+Elapsed time: 02h:04m:56s. Have a nice day!
diff --git a/tests/ci/ci.test b/tests/ci/ci.test
index 2fea94f8fc..9feda8702b 100644
--- a/tests/ci/ci.test
+++ b/tests/ci/ci.test
@@ -2,5 +2,5 @@ control
 thr mpi dcp rst bit dbg
 regional_control
 thr dcp
-cpld_control_c96_noaero_p8
+cpld_control_noaero_p8
 rst dbg
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 7a74fc65a7..0302522b7e 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -7,44 +7,17 @@
 #
 ###############################################################################
 
-THRD=1
+  THRD=1
 
-if [[ $MACHINE_ID = wcoss_cray ]]; then
-
-  TPN=24
-
-  TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
-  TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
-  TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
-
-elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
-
-  TPN=28
-
-  TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
-  TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
-  TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
-  TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
-
-  TASKS_cpl_atmw=196; THRD_cpl_atmw=1
+  TASKS_cpl_atmw=180; THRD_cpl_atmw=1
   INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=46
-
-  TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
-  INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
-  WAV_tasks_atmw_gdas=248
-
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
+  WAV_tasks_atmw=30
 
-  TASKS_cpl_dflt=196; THRD_cpl_dflt=1
+  TASKS_cpl_dflt=200; THRD_cpl_dflt=1
   INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
   OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=8
-  WAV_tasks_cpl_dflt=18
+  ICE_tasks_cpl_dflt=10
+  WAV_tasks_cpl_dflt=20
 
   TASKS_cpl_thrd=120; THRD_cpl_thrd=2
   INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
@@ -52,11 +25,11 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   ICE_tasks_cpl_thrd=10
   WAV_tasks_cpl_thrd=12
 
-  TASKS_cpl_dcmp=196; THRD_cpl_dcmp=1
+  TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1
   INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
   OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=8
-  WAV_tasks_cpl_dcmp=18
+  ICE_tasks_cpl_dcmp=10
+  WAV_tasks_cpl_dcmp=20
 
   TASKS_cpl_mpi=280; THRD_cpl_mpi=1
   INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
@@ -64,21 +37,17 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   ICE_tasks_cpl_mpi=20
   WAV_tasks_cpl_mpi=28
 
-  TASKS_cpl_c384=480; THRD_cpl_c384=2
-  INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=120
-  ICE_tasks_cpl_c384=48
+  TASKS_cpl_bmrk=656; THRD_cpl_bmrk=2
+  INPES_cpl_bmrk=8; JNPES_cpl_bmrk=8; WPG_cpl_bmrk=24
+  OCN_tasks_cpl_bmrk=120
+  ICE_tasks_cpl_bmrk=48
+  WAV_tasks_cpl_bmrk=80
 
-  TASKS_cpl_bmrk_aero=560; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=120
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=80
-
-  TASKS_cpl_c192=384; THRD_cpl_c192=1
+  TASKS_cpl_c192=464; THRD_cpl_c192=2
   INPES_cpl_c192=6; JNPES_cpl_c192=8; WPG_cpl_c192=12
   OCN_tasks_cpl_c192=60
   ICE_tasks_cpl_c192=24
+  WAV_tasks_cpl_c192=80
 
   TASKS_cdeps_100=40
   ATM_compute_tasks_cdeps_100=12
@@ -90,77 +59,40 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
   OCN_tasks_cdeps_025=120
   ICE_tasks_cdeps_025=48
 
-elif [[ $MACHINE_ID = wcoss2.* ]]; then
+if [[ $MACHINE_ID = wcoss_cray ]]; then
 
-  TPN=128
+  TPN=24
 
   TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
   TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
   TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cpl_atmw=196; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=46
+elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
+
+  TPN=28
+
+  TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
+  TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
+  TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
+  TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
   TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=248
 
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
-  TASKS_cpl_dflt=196; THRD_cpl_dflt=1
-  INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=8
-  WAV_tasks_cpl_dflt=18
-
-  TASKS_cpl_thrd=120; THRD_cpl_thrd=2
-  INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=12
-
-  TASKS_cpl_dcmp=196; THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=8
-  WAV_tasks_cpl_dcmp=18
-
-  TASKS_cpl_mpi=280; THRD_cpl_mpi=1
-  INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=34
-  ICE_tasks_cpl_mpi=20
-  WAV_tasks_cpl_mpi=28
-
-  TASKS_cpl_c384=480; THRD_cpl_c384=2
-  INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=120
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=560; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=120
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=80
+elif [[ $MACHINE_ID = wcoss2.* ]]; then
 
-  TASKS_cpl_c192=384; THRD_cpl_c192=1
-  INPES_cpl_c192=6; JNPES_cpl_c192=8; WPG_cpl_c192=12
-  OCN_tasks_cpl_c192=60
-  ICE_tasks_cpl_c192=24
+  TPN=128
 
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
+  TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
+  TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
+  TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
+  TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
+  TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
+  INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
+  WAV_tasks_atmw_gdas=248
 
 elif [[ $MACHINE_ID = orion.* ]]; then
 
@@ -171,69 +103,10 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
   TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cpl_atmw=200; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=50
-
   TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=248
 
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
-  TASKS_cpl_dflt=200; THRD_cpl_dflt=1
-  INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=10
-  WAV_tasks_cpl_dflt=20
-
-  TASKS_cpl_thrd=120; THRD_cpl_thrd=2
-  INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=12
-
-  TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=10
-  WAV_tasks_cpl_dcmp=20
-
-  TASKS_cpl_mpi=280; THRD_cpl_mpi=1
-  INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=34
-  ICE_tasks_cpl_mpi=20
-  WAV_tasks_cpl_mpi=28
-
-  TASKS_cpl_c384=480; THRD_cpl_c384=2
-  INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=120
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=560; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=120
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=80
-
-  TASKS_cpl_c192=384; THRD_cpl_c192=1
-  INPES_cpl_c192=6; JNPES_cpl_c192=8; WPG_cpl_c192=12
-  OCN_tasks_cpl_c192=60
-  ICE_tasks_cpl_c192=24
-
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
-
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
-
 elif [[ $MACHINE_ID = hera.* ]]; then
 
   TPN=40
@@ -243,69 +116,10 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   TASKS_c384=336 ; INPES_c384=6 ; JNPES_c384=8  ; THRD_c384=2
   TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=4
 
-  TASKS_cpl_atmw=200; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=50
-
   TASKS_cpl_atmw_gdas=560; THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=248
 
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
-  TASKS_cpl_dflt=200; THRD_cpl_dflt=1
-  INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=10
-  WAV_tasks_cpl_dflt=20
-
-  TASKS_cpl_thrd=120; THRD_cpl_thrd=2
-  INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=12
-
-  TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=10
-  WAV_tasks_cpl_dcmp=20
-
-  TASKS_cpl_mpi=280; THRD_cpl_mpi=1
-  INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=34
-  ICE_tasks_cpl_mpi=20
-  WAV_tasks_cpl_mpi=28
-
-  TASKS_cpl_c384=480; THRD_cpl_c384=2
-  INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=120
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=560; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=120
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=80
-
-  TASKS_cpl_c192=288; THRD_cpl_c192=1
-  INPES_cpl_c192=4; JNPES_cpl_c192=8; WPG_cpl_c192=12
-  OCN_tasks_cpl_c192=60
-  ICE_tasks_cpl_c192=24
-
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
-
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
-
 elif [[ $MACHINE_ID = linux.* ]]; then
 
   TPN=40
@@ -313,11 +127,6 @@ elif [[ $MACHINE_ID = linux.* ]]; then
   TASKS_dflt=150 ; INPES_dflt=3 ; JNPES_dflt=8
   TASKS_thrd=78  ; INPES_thrd=3 ; JNPES_thrd=4
 
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
   TASKS_cpl_dflt=200; THRD_cpl_dflt=1
   INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
   OCN_tasks_cpl_dflt=20
@@ -339,68 +148,23 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   TASKS_c384=480 ; INPES_c384=6 ; JNPES_c384=12 ; THRD_c384=1
   TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cpl_atmw=192; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=42
-
   TASKS_cpl_atmw_gdas=552; THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=240
 
-  TASKS_cpl_c96=240; THRD_cpl_c96=1
-  INPES_cpl_c96=4; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
-  TASKS_cpl_dflt=200; THRD_cpl_dflt=1
-  INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=10
-  WAV_tasks_cpl_dflt=20
-
-  TASKS_cpl_thrd=120; THRD_cpl_thrd=2
-  INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=12
-
-  TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=10
-  WAV_tasks_cpl_dcmp=20
+  # run only in weekly test
+  TASKS_cpl_bmrk=1808; THRD_cpl_bmrk=2
+  INPES_cpl_bmrk=16; JNPES_cpl_bmrk=16; WPG_cpl_bmrk=24
+  OCN_tasks_cpl_bmrk=100
+  ICE_tasks_cpl_bmrk=48
+  WAV_tasks_cpl_bmrk=100
 
-  TASKS_cpl_mpi=280; THRD_cpl_mpi=1
-  INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=34
-  ICE_tasks_cpl_mpi=20
-  WAV_tasks_cpl_mpi=28
-
-  TASKS_cpl_c384=1324; THRD_cpl_c384=2
-  INPES_cpl_c384=12; JNPES_cpl_c384=16; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=100
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=1808; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=16; JNPES_cpl_bmrk_aero=16; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=100
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=100
-
-  TASKS_cpl_c192=1324; THRD_cpl_c192=2
+  # run only in weekly test
+  TASKS_cpl_c192=1404; THRD_cpl_c192=2
   INPES_cpl_c192=12; JNPES_cpl_c192=16; WPG_cpl_c192=24
   OCN_tasks_cpl_c192=100
   ICE_tasks_cpl_c192=48
-
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
-
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
+  WAV_tasks_cpl_c192=80
 
 elif [[ $MACHINE_ID = s4.* ]]; then
 
@@ -414,70 +178,9 @@ elif [[ $MACHINE_ID = s4.* ]]; then
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
-  TASKS_cpl_atmw=200; TPN_cpl_atmw=16; INPES_cpl_atmw=3; JNPES_cpl_atmw=8
-  THRD_cpl_atmw=2; WPG_cpl_atmw=6; APB_cpl_atmw="0 149"; WPB_cpl_atmw="150 199"
-
   TASKS_cpl_atmw_gdas=560; TPN_cpl_atmw_gdas=16; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
   THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
 
-  TASKS_cpl_c96=192; TPN_cpl_c96=32; INPES_cpl_c96=3; JNPES_cpl_c96=8
-  THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
-  CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
-  NPROC_ICE_cpl_c96=12
-
-  TASKS_cpl_dflt=200; TPN_cpl_dflt=32; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
-  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
-  CHM_cpl_dflt="0 143"; OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199"
-  NPROC_ICE_cpl_dflt=10
-
-  TASKS_cpl_thrd=120; TPN_cpl_thrd=16; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
-  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 71"; APB_cpl_thrd="0 77"
-  CHM_cpl_thrd="0 71"; OPB_cpl_thrd="78 97"; IPB_cpl_thrd="98 107"; WPB_cpl_thrd="108 119"
-  NPROC_ICE_cpl_thrd=10
-
-  TASKS_cpl_dcmp=200; TPN_cpl_dcmp=32; INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6
-  THRD_cpl_dcmp=1; WPG_cpl_dcmp=6;  MPB_cpl_dcmp="0 143"; APB_cpl_dcmp="0 149"
-  CHM_cpl_dcmp="0 143"; OPB_cpl_dcmp="150 169"; IPB_cpl_dcmp="170 179"; WPB_cpl_dcmp="180 199"
-  NPROC_ICE_cpl_dcmp=10
-
-  TASKS_cpl_mpi=280; TPN_cpl_mpi=32; INPES_cpl_mpi=4; JNPES_cpl_mpi=8
-  THRD_cpl_mpi=1; WPG_cpl_mpi=6;  MPB_cpl_mpi="0 191"; APB_cpl_mpi="0 197"
-  CHM_cpl_mpi="232 251"; OPB_cpl_mpi="198 231"; IPB_cpl_mpi="232 251"; WPB_cpl_mpi="252 279"
-  NPROC_ICE_cpl_mpi=20
-
-  TASKS_cpl_c384=480; TPN_cpl_c384=16; INPES_cpl_c384=6; JNPES_cpl_c384=8
-  THRD_cpl_c384=2; WPG_cpl_c384=24; MPB_cpl_c384="0 287"; APB_cpl_c384="0 311"
-  CHM_cpl_c384="0 287"; OPB_cpl_c384="312 431"; IPB_cpl_c384="432 479"
-  NPROC_ICE_cpl_c384=48
-
-  TASKS_cpl_bmrk=560; TPN_cpl_bmrk=32; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
-  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
-  CHM_cpl_bmrk="0 287"; OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"; WPB_cpl_bmrk="480 559"
-  NPROC_ICE_cpl_bmrk=48
-
-  TASKS_cpl_bmrk_aero=560; TPN_cpl_bmrk_aero=16; INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8
-  THRD_cpl_bmrk_aero=2; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 311"
-  CHM_cpl_bmrk_aero="0 287"; OPB_cpl_bmrk_aero="312 431"; IPB_cpl_bmrk_aero="432 479"; WPB_cpl_bmrk_aero="480 559"
-  NPROC_ICE_cpl_bmrk_aero=48
-
-  TASKS_cpl_bmrk_mpi=600; TPN_cpl_bmrk_mpi=32; INPES_cpl_bmrk_mpi=6; JNPES_cpl_bmrk_mpi=8
-  THRD_cpl_bmrk_mpi=1; WPG_cpl_bmrk_mpi=24; MPB_cpl_bmrk_mpi="0 287"; APB_cpl_bmrk_mpi="0 311"
-  OPB_cpl_bmrk_mpi="312 431"; IPB_cpl_bmrk_mpi="432 479"; WPB_cpl_bmrk_mpi="480 599"
-  NPROC_ICE_cpl_bmrk_mpi=48
-
-  TASKS_cpl_c192=288; TPN_cpl_c192=32; INPES_cpl_c192=4; JNPES_cpl_c192=8
-  THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
-  CHM_cpl_c192="0 191"; OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
-  NPROC_ICE_cpl_c192=24
-
-  TASKS_cdeps_100=40; TPN_cdeps_100=32
-  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
-  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
-
-  TASKS_cdeps_025=208; TPN_cdeps_025=32
-  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
-  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
-
 elif [[ $MACHINE_ID = gaea.* ]]; then
 
   TPN=36
@@ -487,69 +190,10 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   TASKS_c384=336 ; INPES_c384=6 ; JNPES_c384=8  ; THRD_c384=2
   TASKS_c768=928 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cpl_atmw=180; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=30
-
   TASKS_cpl_atmw_gdas=576; THRD_cpl_atmw_gdas=3
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=264
 
-  TASKS_cpl_c96=192; THRD_cpl_c96=1
-  INPES_cpl_c96=3; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=30
-  ICE_tasks_cpl_c96=12
-
-  TASKS_cpl_dflt=216; THRD_cpl_dflt=1
-  INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=12
-  WAV_tasks_cpl_dflt=34
-
-  TASKS_cpl_thrd=120; THRD_cpl_thrd=2
-  INPES_cpl_thrd=3; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=12
-
-  TASKS_cpl_dcmp=200; THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=10
-  WAV_tasks_cpl_dcmp=20
-
-  TASKS_cpl_mpi=280; THRD_cpl_mpi=1
-  INPES_cpl_mpi=4; JNPES_cpl_mpi=8; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=34
-  ICE_tasks_cpl_mpi=20
-  WAV_tasks_cpl_mpi=28
-
-  TASKS_cpl_c384=480; THRD_cpl_c384=2
-  INPES_cpl_c384=6; JNPES_cpl_c384=8; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=120
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=576; THRD_cpl_bmrk_aero=2
-  INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=120
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=96
-
-  TASKS_cpl_c192=384; THRD_cpl_c192=1
-  INPES_cpl_c192=6; JNPES_cpl_c192=8; WPG_cpl_c192=12
-  OCN_tasks_cpl_c192=60
-  ICE_tasks_cpl_c192=24
-
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
-
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
-
 elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
   TPN=36
@@ -559,19 +203,10 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   TASKS_c384=336 ; INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
   TASKS_c768=992 ; INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
 
-  TASKS_cpl_atmw=180; THRD_cpl_atmw=1
-  INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
-  WAV_tasks_atmw=30
-
   TASKS_cpl_atmw_gdas=576; THRD_cpl_atmw_gdas=3
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=264
 
-  TASKS_cpl_c96=324; THRD_cpl_c96=1
-  INPES_cpl_c96=6; JNPES_cpl_c96=8; WPG_cpl_c96=6
-  OCN_tasks_cpl_c96=20
-  ICE_tasks_cpl_c96=10
-
   TASKS_cpl_dflt=344; THRD_cpl_dflt=1
   INPES_cpl_dflt=6; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
   OCN_tasks_cpl_dflt=20
@@ -596,31 +231,11 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   ICE_tasks_cpl_mpi=12
   WAV_tasks_cpl_mpi=24
 
-  TASKS_cpl_c384=728; THRD_cpl_c384=3
-  INPES_cpl_c384=8; JNPES_cpl_c384=12; WPG_cpl_c384=24
-  OCN_tasks_cpl_c384=80
-  ICE_tasks_cpl_c384=48
-
-  TASKS_cpl_bmrk_aero=828; THRD_cpl_bmrk_aero=3
-  INPES_cpl_bmrk_aero=8; JNPES_cpl_bmrk_aero=12; WPG_cpl_bmrk_aero=24
-  OCN_tasks_cpl_bmrk_aero=80
-  ICE_tasks_cpl_bmrk_aero=48
-  WAV_tasks_cpl_bmrk_aero=100
-
-  TASKS_cpl_c192=564; THRD_cpl_c192=2
-  INPES_cpl_c192=8; JNPES_cpl_c192=8; WPG_cpl_c192=12
-  OCN_tasks_cpl_c192=120
-  ICE_tasks_cpl_c192=48
-
-  TASKS_cdeps_100=40
-  ATM_compute_tasks_cdeps_100=12
-  OCN_tasks_cdeps_100=16
-  ICE_tasks_cdeps_100=12
-
-  TASKS_cdeps_025=208
-  ATM_compute_tasks_cdeps_025=40
-  OCN_tasks_cdeps_025=120
-  ICE_tasks_cdeps_025=48
+  TASKS_cpl_bmrk=868; THRD_cpl_bmrk=2
+  INPES_cpl_bmrk=12; JNPES_cpl_bmrk=8; WPG_cpl_bmrk=24
+  OCN_tasks_cpl_bmrk=120
+  ICE_tasks_cpl_bmrk=48
+  WAV_tasks_cpl_bmrk=100
 
 elif [[ $MACHINE_ID = stampede.* ]]; then
 
@@ -633,70 +248,9 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   TASKS_c768=992 ; TPN_c768=20 ; INPES_c768=8 ; JNPES_c768=16
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
 
-  TASKS_cpl_atmw=192; TPN_cpl_atmw=48; INPES_cpl_atmw=3; JNPES_cpl_atmw=8
-  THRD_cpl_atmw=1; WPG_cpl_atmw=6; APB_cpl_atmw="0 149"; WPB_cpl_atmw="150 191"
-
   TASKS_cpl_atmw_gdas=560; TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
   THRD_cpl_atmw_gdas=4; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
 
-  TASKS_cpl_c96=192; TPN_cpl_c96=48; INPES_cpl_c96=3; JNPES_cpl_c96=8
-  THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
-  CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
-  NPROC_ICE_cpl_c96=12
-
-  TASKS_cpl_dflt=200; TPN_cpl_dflt=48; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
-  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
-  CHM_cpl_dflt="0 143"; OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199"
-  NPROC_ICE_cpl_dflt=10
-
-  TASKS_cpl_thrd=120; TPN_cpl_thrd=24; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
-  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 71"; APB_cpl_thrd="0 77"
-  CHM_cpl_thrd="0 71"; OPB_cpl_thrd="78 97"; IPB_cpl_thrd="98 107"; WPB_cpl_thrd="108 119"
-  NPROC_ICE_cpl_thrd=10
-
-  TASKS_cpl_dcmp=200; TPN_cpl_dcmp=48; INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6
-  THRD_cpl_dcmp=1; WPG_cpl_dcmp=6;  MPB_cpl_dcmp="0 143"; APB_cpl_dcmp="0 149"
-  CHM_cpl_dcmp="0 143"; OPB_cpl_dcmp="150 169"; IPB_cpl_dcmp="170 179"; WPB_cpl_dcmp="180 199"
-  NPROC_ICE_cpl_dcmp=10
-
-  TASKS_cpl_mpi=280; TPN_cpl_mpi=48; INPES_cpl_mpi=4; JNPES_cpl_mpi=8
-  THRD_cpl_mpi=1; WPG_cpl_mpi=6;  MPB_cpl_mpi="0 191"; APB_cpl_mpi="0 197"
-  CHM_cpl_mpi="0 191"; OPB_cpl_mpi="198 231"; IPB_cpl_mpi="232 251"; WPB_cpl_mpi="252 279"
-  NPROC_ICE_cpl_mpi=20
-
-  TASKS_cpl_c384=480; TPN_cpl_c384=24; INPES_cpl_c384=6; JNPES_cpl_c384=8
-  THRD_cpl_c384=2; WPG_cpl_c384=24; MPB_cpl_c384="0 287"; APB_cpl_c384="0 311"
-  CHM_cpl_c384="0 287"; OPB_cpl_c384="312 431"; IPB_cpl_c384="432 479"
-  NPROC_ICE_cpl_c384=48
-
-  TASKS_cpl_bmrk=560; TPN_cpl_bmrk=48; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
-  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
-  CHM_cpl_bmrk="0 287"; OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"; WPB_cpl_bmrk="480 559"
-  NPROC_ICE_cpl_bmrk=48
-
-  TASKS_cpl_bmrk_aero=560; TPN_cpl_bmrk_aero=24; INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8
-  THRD_cpl_bmrk_aero=2; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 311"
-  CHM_cpl_bmrk_aero="0 287"; OPB_cpl_bmrk_aero="312 431"; IPB_cpl_bmrk_aero="432 479"; WPB_cpl_bmrk_aero="480 559"
-  NPROC_ICE_cpl_bmrk_aero=48
-
-  TASKS_cpl_bmrk_mpi=600; TPN_cpl_bmrk_mpi=40; INPES_cpl_bmrk_mpi=6; JNPES_cpl_bmrk_mpi=8
-  THRD_cpl_bmrk_mpi=1; WPG_cpl_bmrk_mpi=24; MPB_cpl_bmrk_mpi="0 287"; APB_cpl_bmrk_mpi="0 311"
-  CHM_cpl_bmrk_mpi="0 287"; OPB_cpl_bmrk_mpi="312 431"; IPB_cpl_bmrk_mpi="432 479"; WPB_cpl_bmrk_mpi="480 599"
-  NPROC_ICE_cpl_bmrk_mpi=48
-
-  TASKS_cpl_c192=288; TPN_cpl_c192=48; INPES_cpl_c192=4; JNPES_cpl_c192=8
-  THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
-  CHM_cpl_c192="0 191"; OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
-  NPROC_ICE_cpl_c192=24
-
-  TASKS_cdeps_100=40; TPN_cdeps_100=48
-  MPB_cdeps_100="0 11"; APB_cdeps_100="0 11"
-  OPB_cdeps_100="12 27"; IPB_cdeps_100="28 39"
-
-  TASKS_cdeps_025=208; TPN_cdeps_025=48
-  MPB_cdeps_025="0 39"; APB_cdeps_025="0 39"
-  OPB_cdeps_025="40 159"; IPB_cdeps_025="160 207"
-
 elif [[ $MACHINE_ID = expanse.* ]]; then
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"
@@ -706,66 +260,9 @@ elif [[ $MACHINE_ID = expanse.* ]]; then
   TASKS_thrd=78  ; TPN_thrd=64 ; INPES_thrd=3 ; JNPES_thrd=4
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
 
-  TASKS_cpl_atmw=200; TPN_cpl_atmw=64; INPES_cpl_atmw=3; JNPES_cpl_atmw=8
-  THRD_cpl_atmw=1; WPG_cpl_atmw=6; APB_cpl_atmw="0 149"; WPB_cpl_atmw="150 199"
-
   TASKS_cpl_atmw_gdas=560; TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
   THRD_cpl_atmw_gdas=2; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 559"
 
-  TASKS_cpl_c96=192; TPN_cpl_c96=64; INPES_cpl_c96=3; JNPES_cpl_c96=8
-  THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
-  CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
-  NPROC_ICE_cpl_c96=12
-
-  TASKS_cpl_dflt=384; TPN_cpl_dflt=64; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
-  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
-  CHM_cpl_dflt="0 143"; OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"; WPB_cpl_dflt="192 383"
-  NPROC_ICE_cpl_dflt=10
-
-  TASKS_cpl_thrd=120; TPN_cpl_thrd=32; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
-  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 71"; APB_cpl_thrd="0 77"
-  CHM_cpl_thrd="0 71"; OPB_cpl_thrd="78 97"; IPB_cpl_thrd="98 107"; WPB_cpl_thrd="108 119"
-  NPROC_ICE_cpl_thrd=10
-
-  TASKS_cpl_dcmp=200; TPN_cpl_dcmp=64; INPES_cpl_dcmp=4; JNPES_cpl_dcmp=6
-  THRD_cpl_dcmp=1; WPG_cpl_dcmp=6;  MPB_cpl_dcmp="0 143"; APB_cpl_dcmp="0 149"
-  CHM_cpl_dcmp="0 143"; OPB_cpl_dcmp="150 169"; IPB_cpl_dcmp="170 179"; WPB_cpl_dcmp="180 199"
-  NPROC_ICE_cpl_dcmp=10
-
-  TASKS_cpl_mpi=280; TPN_cpl_mpi=64; INPES_cpl_mpi=4; JNPES_cpl_mpi=8
-  THRD_cpl_mpi=1; WPG_cpl_mpi=6;  MPB_cpl_mpi="0 191"; APB_cpl_mpi="0 197"
-  CHM_cpl_mpi="0 191"; OPB_cpl_mpi="198 231"; IPB_cpl_mpi="232 251"; WPB_cpl_mpi="252 279"
-  NPROC_ICE_cpl_mpi=20
-
-  TASKS_cpl_bmrk=480; TPN_cpl_bmrk=64; INPES_cpl_bmrk=6; JNPES_cpl_bmrk=8
-  THRD_cpl_bmrk=1; WPG_cpl_bmrk=24; MPB_cpl_bmrk="0 287"; APB_cpl_bmrk="0 311"
-  CHM_cpl_bmrk="0 287"; OPB_cpl_bmrk="312 431"; IPB_cpl_bmrk="432 479"
-  NPROC_ICE_cpl_bmrk=48
-
-  TASKS_cpl_bmrk_aero=480; TPN_cpl_bmrk_aero=32; INPES_cpl_bmrk_aero=6; JNPES_cpl_bmrk_aero=8
-  THRD_cpl_bmrk_aero=2; WPG_cpl_bmrk_aero=24; MPB_cpl_bmrk_aero="0 287"; APB_cpl_bmrk_aero="0 311"
-  CHM_cpl_bmrk_aero="0 287"; OPB_cpl_bmrk_aero="312 431"; IPB_cpl_bmrk_aero="432 479"
-  NPROC_ICE_cpl_bmrk_aero=48
-
-  TASKS_cpl_wwav=640; TPN_cpl_wwav=64; INPES_cpl_wwav=6; JNPES_cpl_wwav=8
-  THRD_cpl_wwav=2; WPG_cpl_wwav=24; MPB_cpl_wwav="0 287"; APB_cpl_wwav="0 311"
-  CHM_cpl_wwav="0 287"; OPB_cpl_wwav="312 431"; IPB_cpl_wwav="432 479"; WPB_cpl_wwav="480 639"
-
-  TASKS_cpl_bmrk_mpi=600; TPN_cpl_bmrk_mpi=40; INPES_cpl_bmrk_mpi=6; JNPES_cpl_bmrk_mpi=8
-  THRD_cpl_bmrk_mpi=1; WPG_cpl_bmrk_mpi=24; MPB_cpl_bmrk_mpi="0 287"; APB_cpl_bmrk_mpi="0 311"
-  OPB_cpl_bmrk_mpi="312 431"; IPB_cpl_bmrk_mpi="432 479"; WPB_cpl_bmrk_mpi="480 599"
-  NPROC_ICE_cpl_bmrk_mpi=48
-
-  TASKS_cpl_c192=288; TPN_cpl_c192=64; INPES_cpl_c192=4; JNPES_cpl_c192=8
-  THRD_cpl_c192=1; WPG_cpl_c192=12;  MPB_cpl_c192="0 191"; APB_cpl_c192="0 203"
-  CHM_cpl_c192="0 191"; OPB_cpl_c192="204 263"; IPB_cpl_c192="264 287"
-  NPROC_ICE_cpl_c192=24
-
-  TASKS_cpl_c384=318; TPN_cpl_c384=32; INPES_cpl_c384=3; JNPES_cpl_c384=8
-  THRD_cpl_c384=2; WPG_cpl_c384=6;  MPB_cpl_c384="0 143"; APB_cpl_c384="0 149"
-  CHM_cpl_c384="0 143"; OPB_cpl_c384="150 269"; IPB_cpl_c384="270 317"
-  NPROC_ICE_cpl_c384=48
-
 else
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}"
@@ -774,10 +271,6 @@ else
 fi
 
 WLCLK_dflt=30
-# Longer default walltime on Gaea
-if [[ $MACHINE_ID = gaea.* ]]; then
-  WLCLK_dflt=180
-fi
 
 export WLCLK=$WLCLK_dflt
 
@@ -1055,6 +548,10 @@ export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 export RST_END=$RUN_END
 export RST_2_END=$RUN_END
+# ATMW
+export MULTIGRID=true
+# ATMA
+export AOD_FRQ=060000
 
 # Regional
 export WRITE_RESTART_WITH_BCS=.false.
@@ -1108,6 +605,9 @@ export JNPES=$JNPES_cpl_dflt
 export THRD=$THRD_cpl_dflt
 export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
+OCN_tasks=$OCN_tasks_cpl_dflt
+ICE_tasks=$ICE_tasks_cpl_dflt
+WAV_tasks=$WAV_tasks_cpl_dflt
 
 # component and coupling timesteps
 export DT_ATMOS=720
@@ -1116,7 +616,7 @@ export DT_DYNAM_MOM6=1800
 export DT_THERM_MOM6=3600
 
 # nems.configure defaults
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
+export NEMS_CONFIGURE=nems.configure.cpld.IN
 export med_model=cmeps
 export atm_model=fv3
 export chm_model=gocart
@@ -1136,12 +636,13 @@ export RUNTYPE=startup
 export CICERUNTYPE=initial
 export eps_imesh=1.0e-1
 export ATMTILESIZE=`expr $NPX - 1`
+export MULTIGRID=false
 
 # FV3 defaults
 export FRAC_GRID=.true.
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8
 export INPUT_NML=cpld_control.nml.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke
+export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 export DIAG_TABLE=diag_table_p7.2_template
 
 export DIAG_TABLE_ADDITIONAL=''
@@ -1253,6 +754,7 @@ export CPLICE=.true.
 export CPL=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
+export CPLCHM=.true.
 
 # for FV3: default values will be changed if doing a warm-warm restart
 export WARM_START=.false.
@@ -1284,7 +786,7 @@ export EPBL=-999.
 
 # CICE6 defaults; 1 degree
 export CICE_DECOMP=slenderX2
-export NPROC_ICE=${ICE_tasks_cpl_dflt}
+export NPROC_ICE=$ICE_tasks
 # SlenderX2
 export CICE_DECOMP=slenderX2
 export np2=`expr $NPROC_ICE / 2`
@@ -1306,7 +808,15 @@ export FRAZIL_FWSALT=.true.
 export CICE_HIST_AVG=.true.
 
 #wave
-export WW3GRIDLINE="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export INPUT_CURFLD='T F     Currents'
+export INPUT_ICEFLD='T F     Ice concentrations'
+export WW3RSTDTHR=3
+export WW3OUTDTHR=3
+export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+export WW3GRIDLINE="'ww3'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export UNIPOINTS='points'
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export OUT_BEG=$RUN_BEG
@@ -1315,6 +825,8 @@ export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 export RST_END=$RUN_END
 export RST_2_END=$RUN_END
+# gocart inst_aod output; uses AERO_HIST.rc.IN from parm/gocart directory
+export AOD_FRQ=060000
 
 # checkpoint restarts
 export RESTART_FILE_PREFIX=''
@@ -1533,6 +1045,9 @@ export LAT2=55.0
 export DLON=0.03
 export DLAT=0.03
 
+# shel.inp
+export INPUT_CURFLD='F F     Currents'
+export INPUT_ICEFLD='F F     Ice concentrations'
 # input.nml
 export CPL_IMP_MRG=.true.
 
@@ -1546,6 +1061,8 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export MESH_WAV=mesh.hafs.nc
+export MULTIGRID=false
 }
 
 export_hafs ()
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
index 49de53ebe5..5a5a7041d1 100644
--- a/tests/fv3_conf/control_run.IN
+++ b/tests/fv3_conf/control_run.IN
@@ -87,6 +87,7 @@ else
 fi
 
 if [ $CPLWAV = .true. ]; then
+  cp    @[INPUTDATA_ROOT_WW3]/mod_def.pointsatmw mod_def.points
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   cp    @[INPUTDATA_ROOT_WW3]/rmp_src* .
 fi
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index b4b0765aae..39c9a13a3a 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -44,7 +44,12 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 
 # WW3 fix/input
 if [[ $CPLWAV == .true. ]]; then
-  cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
+  cp    @[INPUTDATA_ROOT_WW3]/mod_def.points .
+  if [[ $OCNRES == 025 ]]; then
+     cp    @[INPUTDATA_ROOT_WW3]/mod_def.mx@[OCNRES]lite mod_def.ww3
+  else
+     cp    @[INPUTDATA_ROOT_WW3]/mod_def.mx@[OCNRES] mod_def.ww3
+  fi
 fi
 
 #rrtmgp
@@ -101,6 +106,9 @@ else
   RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
   cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
   ls -1 ./INPUT/${RFILE}>ice.restart_file
+
+  # WAVE restart file
+  cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
 fi
 
 #inline post
@@ -127,12 +135,12 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ls* ./INPUT
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ss* ./INPUT
 
-if [ $IMP_PHYSICS = 8 ]; then 
-  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN 
-  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/freezeH2O.dat freezeH2O.dat   
+if [ $IMP_PHYSICS = 8 ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/freezeH2O.dat freezeH2O.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qg.dat qr_acr_qg.dat
-  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qs.dat qr_acr_qs.dat 
-fi 
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qs.dat qr_acr_qs.dat
+fi
 
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
diff --git a/tests/fv3_conf/hafs_ww3_run.IN b/tests/fv3_conf/hafs_ww3_run.IN
index ef153bc3d1..3270300212 100644
--- a/tests/fv3_conf/hafs_ww3_run.IN
+++ b/tests/fv3_conf/hafs_ww3_run.IN
@@ -4,6 +4,7 @@ if [ ${CNTL_DIR} = "hafs_regional_atm_wav" ] || \
    [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
   cp @[INPUTDATA_ROOT_WW3]/mod_def.natl_6m ./mod_def.ww3
   cp @[INPUTDATA_ROOT_WW3]/mod_def.points ./mod_def.points
+  cp @[INPUTDATA_ROOT_WW3]/mesh.hafs.nc ./mesh.hafs.nc
   if [ ${CNTL_DIR} = "hafs_regional_storm_following_1nest_atm_ocn_wav" ]; then
     cp @[INPUTDATA_ROOT]/FV3_hafs_input_data/WW3_hafs_regional_input_data/wind.natl_6m_2020082512 ./wind.ww3
   else
diff --git a/tests/opnReqTest b/tests/opnReqTest
index abee341e8b..b9851d9795 100755
--- a/tests/opnReqTest
+++ b/tests/opnReqTest
@@ -625,7 +625,7 @@ mkdir -p ${STMP}/${USER}
 NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST
 RTPWD=${NEW_BASELINE}
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
-INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113/
+INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220418/
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}
 
 rm -rf $NEW_BASELINE
diff --git a/tests/opnReqTests/dbg.sh b/tests/opnReqTests/dbg.sh
index d5f31b3c58..1268a27977 100644
--- a/tests/opnReqTests/dbg.sh
+++ b/tests/opnReqTests/dbg.sh
@@ -18,18 +18,21 @@ elif [[ $application == 'regional' ]]; then
   echo "Regional application not yet implemented for debug"
   exit 1
 elif [[ $application == 'cpld' ]]; then
-  FHMAX=6
-  DAYS=0.25
+  FHMAX=3
+  DAYS=0.125
   NFHOUT_HF=1
   RESTART_INTERVAL=${FHMAX}
   RESTART_N=${FHMAX}
   OUTPUT_FH="0 ${FHMAX}"
-  LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024/sfcf006/g" \
-                                   | sed -E "s/atmf024/atmf006/g" \
-                                   | sed -E "s/2021-03-23-21600/2021-03-22-43200/g" \
-                                   | sed -E "s/sfcf021.tile[1-6].nc ?//g" \
-                                   | sed -E "s/atmf021.tile[1-6].nc ?//g" \
-                                   | sed -E "s/(gocart.inst_aod.202103)23_0600z.nc4/\122_1200z.nc4/g" \
+  AOD_FRQ=030000
+  LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024/sfcf003/g" \
+                                   | sed -E "s/atmf024/atmf003/g" \
+                                   | sed -E "s/2021-03-23-21600/2021-03-22-32400/g" \
+                                   | sed -E "s/sfcf021\.tile[1-6]\.nc ?//g" \
+                                   | sed -E "s/atmf021\.tile[1-6]\.nc ?//g" \
+                                   | sed -E "s/(gocart\.inst_aod\.202103)23_0600z\.nc4/\122_0900z\.nc4/g" \
+                                   | sed -E "s/20210323\.060000\.out_pnt\.ww3/20210322\.090000\.out_pnt\.ww3/g" \
+                                   | sed -E "s/20210323\.060000\.out_grd\.ww3/20210322\.090000\.out_grd\.ww3/g" \
                                    | sed -e "s/^ *//" -e "s/ *$//")
 fi
 
diff --git a/tests/opnReqTests/rst.sh b/tests/opnReqTests/rst.sh
index 73cab71968..04bd879d64 100644
--- a/tests/opnReqTests/rst.sh
+++ b/tests/opnReqTests/rst.sh
@@ -33,6 +33,7 @@ elif [[ $application == 'cpld' ]]; then
   RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
   RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( SHOUR + FHROT )))"
   RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (SHOUR + FHROT)* 3600 )))"
+  RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR} )))0000"
 fi
 
 WARM_START=.T.
@@ -68,6 +69,10 @@ export MOM6_RESTART_SETTING=${MOM6_RESTART_SETTING:-}
 export RESTART_N=${RESTART_N:-}
 export RESTART_FILE_SUFFIX_HRS=${RESTART_FILE_SUFFIX_HRS:-}
 export RESTART_FILE_SUFFIX_SECS=${RESTART_FILE_SUFFIX_SECS:-}
+export RUN_BEG="${RUN_BEG:-}"
+export OUT_BEG="${RUN_BEG:-}"
+export RST_BEG="${RUN_BEG:-}"
+export RST_2_BEG="${RUN_BEG:-}"
 export DEP_RUN=${DEP_RUN:-}
 export WARM_START=${WARM_START}
 export NGGPS_IC=${NGGPS_IC}
diff --git a/tests/opnReqTests/wrt_env.sh b/tests/opnReqTests/wrt_env.sh
index af9801cc3f..135e0fd9f1 100644
--- a/tests/opnReqTests/wrt_env.sh
+++ b/tests/opnReqTests/wrt_env.sh
@@ -26,4 +26,5 @@ export NFHMAX_HF=${NFHMAX_HF}
 export NFHOUT_HF=${NFHOUT_HF}
 export LIST_FILES="${LIST_FILES}"
 export OUTPUT_FH="${OUTPUT_FH}"
+export AOD_FRQ=${AOD_FRQ:-}
 EOF
diff --git a/tests/parm/gocart/AERO_HISTORY.rc b/tests/parm/gocart/AERO_HISTORY.rc.IN
similarity index 99%
rename from tests/parm/gocart/AERO_HISTORY.rc
rename to tests/parm/gocart/AERO_HISTORY.rc.IN
index e71d970f16..939e0a734f 100644
--- a/tests/parm/gocart/AERO_HISTORY.rc
+++ b/tests/parm/gocart/AERO_HISTORY.rc.IN
@@ -381,7 +381,7 @@ PC720x361-DC.LM: 72
   inst_aod.template:   '%y4%m2%d2_%h2%n2z.nc4' ,
   inst_aod.archive:    '%c/Y%y4' ,
   inst_aod.mode:       'instantaneous'
-  inst_aod.frequency:  060000,
+  inst_aod.frequency:  @[AOD_FRQ],
   inst_aod.duration:   010000,
   inst_aod.ref_time:   000000,
   inst_aod.grid_label: PC720x361-DC
diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
index 8b4c1f8a04..d1192f3318 100644
--- a/tests/parm/nems.configure.cpld.IN
+++ b/tests/parm/nems.configure.cpld.IN
@@ -6,7 +6,7 @@
 logKindFlag:            ESMF_LOGKIND_MULTI
 
 # EARTH #
-EARTH_component_list: MED ATM OCN ICE
+EARTH_component_list: MED ATM CHM OCN ICE WAV
 EARTH_attributes::
   Verbosity = 0
 ::
@@ -26,6 +26,13 @@ ATM_attributes::
   OverwriteSlice = true
 ::
 
+# CHM #
+CHM_model:                      @[chm_model]
+CHM_petlist_bounds:             @[chm_petlist_bounds]
+CHM_attributes::
+  Verbosity = 0
+::
+
 # OCN #
 OCN_model:                      @[ocn_model]
 OCN_petlist_bounds:             @[ocn_petlist_bounds]
@@ -51,6 +58,18 @@ ICE_attributes::
   stop_ymd = -999
 ::
 
+# WAV #
+WAV_model:                      @[wav_model]
+WAV_petlist_bounds:             @[wav_petlist_bounds]
+WAV_attributes::
+  Verbosity = 0
+  OverwriteSlice = false
+  diro = "."
+  logfile = wav.log
+  mesh_wav = @[MESHOCN_ICE]
+  multigrid = @[MULTIGRID]
+::
+
 # CMEPS warm run sequence
 runSeq::
 @@[coupling_interval_slow_sec]
@@ -60,14 +79,24 @@ runSeq::
    @@[coupling_interval_fast_sec]
      MED med_phases_prep_atm
      MED med_phases_prep_ice
+     MED med_phases_prep_wav_accum
+     MED med_phases_prep_wav_avg
      MED -> ATM :remapMethod=redist
      MED -> ICE :remapMethod=redist
-     ATM
+     MED -> WAV :remapMethod=redist
+     ATM phase1
+     ATM -> CHM
+     CHM
+     CHM -> ATM
+     ATM phase2
      ICE
+     WAV
      ATM -> MED :remapMethod=redist
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     WAV -> MED :remapMethod=redist
+     MED med_phases_post_wav
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -85,6 +114,7 @@ MED_attributes::
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
+      WAV_model = @[wav_model]
       history_n = 1
       history_option = nhours
       history_ymd = -999
diff --git a/tests/parm/nems.configure.cpld_aero.IN b/tests/parm/nems.configure.cpld_aero.IN
deleted file mode 100644
index 48388bd808..0000000000
--- a/tests/parm/nems.configure.cpld_aero.IN
+++ /dev/null
@@ -1,123 +0,0 @@
-#############################################
-####  NEMS Run-Time Configuration File  #####
-#############################################
-
-# ESMF #
- logKindFlag:            ESMF_LOGKIND_MULTI
-
-# EARTH #
-EARTH_component_list: MED ATM CHM OCN ICE
-EARTH_attributes::
-  Verbosity = 0
-::
-
-# MED #
-MED_model:                      @[med_model]
-MED_petlist_bounds:             @[med_petlist_bounds]
-::
-
-# ATM #
-ATM_model:                      @[atm_model]
-ATM_petlist_bounds:             @[atm_petlist_bounds]
-ATM_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-::
-
-# CHM #
-CHM_model:                      @[chm_model]
-CHM_petlist_bounds:             @[chm_petlist_bounds]
-CHM_attributes::
-  Verbosity = 0
-::
-
-# OCN #
-OCN_model:                      @[ocn_model]
-OCN_petlist_bounds:             @[ocn_petlist_bounds]
-OCN_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-  mesh_ocn = @[MESHOCN_ICE]
-::
-
-# ICE #
-ICE_model:                      @[ice_model]
-ICE_petlist_bounds:             @[ice_petlist_bounds]
-ICE_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-  mesh_ice = @[MESHOCN_ICE]
-  stop_n = @[RESTART_N]
-  stop_option = nhours
-  stop_ymd = -999
-::
-
-# CMEPS warm run sequence
-runSeq::
-@@[coupling_interval_slow_sec]
-   MED med_phases_prep_ocn_avg
-   MED -> OCN :remapMethod=redist
-   OCN
-   @@[coupling_interval_fast_sec]
-     MED med_phases_prep_atm
-     MED med_phases_prep_ice
-     MED -> ATM :remapMethod=redist
-     MED -> ICE :remapMethod=redist
-     ATM phase1
-     ATM -> CHM
-     CHM
-     CHM -> ATM
-     ATM phase2
-     ICE
-     ATM -> MED :remapMethod=redist
-     MED med_phases_post_atm
-     ICE -> MED :remapMethod=redist
-     MED med_phases_post_ice
-     MED med_phases_prep_ocn_accum
-   @
-   OCN -> MED :remapMethod=redist
-   MED med_phases_post_ocn
-   MED med_phases_restart_write
-@
-::
-
-# CMEPS variables
-
-DRIVER_attributes::
-::
-
-MED_attributes::
-      ATM_model = @[atm_model]
-      ICE_model = @[ice_model]
-      OCN_model = @[ocn_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
-      coupling_mode = @[CPLMODE]
-      history_tile_atm = @[ATMTILESIZE]
-::
-ALLCOMP_attributes::
-      ScalarFieldCount = 2
-      ScalarFieldIdxGridNX = 1
-      ScalarFieldIdxGridNY = 2
-      ScalarFieldName = cpl_scalars
-      start_type = @[RUNTYPE]
-      restart_dir = RESTART/
-      case_name = ufs.cpld
-      restart_n = @[RESTART_N]
-      restart_option = nhours
-      restart_ymd = -999
-      dbug_flag = @[cap_dbug_flag]
-      use_coldstart = @[use_coldstart]
-      use_mommesh = @[use_mommesh]
-      eps_imesh = @[eps_imesh]
-      stop_n = @[FHMAX]
-      stop_option = nhours
-      stop_ymd = -999
-::
diff --git a/tests/parm/nems.configure.cpld_aero_wave.IN b/tests/parm/nems.configure.cpld_aero_wave.IN
deleted file mode 100644
index 166fa4419a..0000000000
--- a/tests/parm/nems.configure.cpld_aero_wave.IN
+++ /dev/null
@@ -1,137 +0,0 @@
-#############################################
-####  NEMS Run-Time Configuration File  #####
-#############################################
-
-# ESMF #
- logKindFlag:            ESMF_LOGKIND_MULTI
-
-# EARTH #
-EARTH_component_list: MED ATM CHM OCN ICE WAV
-EARTH_attributes::
-  Verbosity = 0
-::
-
-# MED #
-MED_model:                      @[med_model]
-MED_petlist_bounds:             @[med_petlist_bounds]
-::
-
-# ATM #
-ATM_model:                      @[atm_model]
-ATM_petlist_bounds:             @[atm_petlist_bounds]
-ATM_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-::
-
-# CHM #
-CHM_model:                      @[chm_model]
-CHM_petlist_bounds:             @[chm_petlist_bounds]
-CHM_attributes::
-  Verbosity = 0
-::
-
-# OCN #
-OCN_model:                      @[ocn_model]
-OCN_petlist_bounds:             @[ocn_petlist_bounds]
-OCN_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-  mesh_ocn = @[MESHOCN_ICE]
-::
-
-# ICE #
-ICE_model:                      @[ice_model]
-ICE_petlist_bounds:             @[ice_petlist_bounds]
-ICE_attributes::
-  Verbosity = 0
-  DumpFields = false
-  ProfileMemory = false
-  OverwriteSlice = true
-  mesh_ice = @[MESHOCN_ICE]
-  stop_n = @[RESTART_N]
-  stop_option = nhours
-  stop_ymd = -999
-::
-
-# WAV #
-WAV_model:                      @[wav_model]
-WAV_petlist_bounds:             @[wav_petlist_bounds]
-WAV_attributes::
-  Verbosity = 0
-  OverwriteSlice = false
-::
-
-# CMEPS warm run sequence
-runSeq::
-@@[coupling_interval_slow_sec]
-   MED med_phases_prep_ocn_avg
-   MED -> OCN :remapMethod=redist
-   OCN -> WAV
-   WAV -> OCN :srcMaskValues=1
-   OCN
-   @@[coupling_interval_fast_sec]
-     MED med_phases_prep_atm
-     MED med_phases_prep_ice
-     MED -> ATM :remapMethod=redist
-     MED -> ICE :remapMethod=redist
-     WAV -> ATM :srcMaskValues=1
-     ATM -> WAV
-     ICE -> WAV
-     ATM phase1
-     ATM -> CHM
-     CHM
-     CHM -> ATM
-     ATM phase2
-     ICE
-     WAV
-     ATM -> MED :remapMethod=redist
-     MED med_phases_post_atm
-     ICE -> MED :remapMethod=redist
-     MED med_phases_post_ice
-     MED med_phases_prep_ocn_accum
-   @
-   OCN -> MED :remapMethod=redist
-   MED med_phases_post_ocn
-   MED med_phases_restart_write
-@
-::
-
-# CMEPS variables
-
-DRIVER_attributes::
-::
-
-MED_attributes::
-      ATM_model = @[atm_model]
-      ICE_model = @[ice_model]
-      OCN_model = @[ocn_model]
-      history_n = 1
-      history_option = nhours
-      history_ymd = -999
-      coupling_mode = @[CPLMODE]
-      history_tile_atm = @[ATMTILESIZE]
-::
-ALLCOMP_attributes::
-      ScalarFieldCount = 2
-      ScalarFieldIdxGridNX = 1
-      ScalarFieldIdxGridNY = 2
-      ScalarFieldName = cpl_scalars
-      start_type = @[RUNTYPE]
-      restart_dir = RESTART/
-      case_name = ufs.cpld
-      restart_n = @[RESTART_N]
-      restart_option = nhours
-      restart_ymd = -999
-      dbug_flag = @[cap_dbug_flag]
-      use_coldstart = @[use_coldstart]
-      use_mommesh = @[use_mommesh]
-      eps_imesh = @[eps_imesh]
-      stop_n = @[FHMAX]
-      stop_option = nhours
-      stop_ymd = -999
-::
diff --git a/tests/parm/nems.configure.cpld_wave.IN b/tests/parm/nems.configure.cpld_noaero.IN
similarity index 90%
rename from tests/parm/nems.configure.cpld_wave.IN
rename to tests/parm/nems.configure.cpld_noaero.IN
index 107bb9d95d..e69ebc817b 100644
--- a/tests/parm/nems.configure.cpld_wave.IN
+++ b/tests/parm/nems.configure.cpld_noaero.IN
@@ -14,6 +14,7 @@ EARTH_attributes::
 # MED #
 MED_model:                      @[med_model]
 MED_petlist_bounds:             @[med_petlist_bounds]
+::
 
 # ATM #
 ATM_model:                      @[atm_model]
@@ -56,6 +57,10 @@ WAV_petlist_bounds:             @[wav_petlist_bounds]
 WAV_attributes::
   Verbosity = 0
   OverwriteSlice = false
+  diro = "."
+  logfile = wav.log
+  mesh_wav = @[MESHOCN_ICE]
+  multigrid = @[MULTIGRID]
 ::
 
 # CMEPS warm run sequence
@@ -63,17 +68,15 @@ runSeq::
 @@[coupling_interval_slow_sec]
    MED med_phases_prep_ocn_avg
    MED -> OCN :remapMethod=redist
-   OCN -> WAV
-   WAV -> OCN :srcMaskValues=1
    OCN
    @@[coupling_interval_fast_sec]
      MED med_phases_prep_atm
      MED med_phases_prep_ice
+     MED med_phases_prep_wav_accum
+     MED med_phases_prep_wav_avg
      MED -> ATM :remapMethod=redist
      MED -> ICE :remapMethod=redist
-     WAV -> ATM :srcMaskValues=1
-     ATM -> WAV
-     ICE -> WAV
+     MED -> WAV :remapMethod=redist
      ATM
      ICE
      WAV
@@ -81,6 +84,8 @@ runSeq::
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     WAV -> MED :remapMethod=redist
+     MED med_phases_post_wav
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -98,6 +103,7 @@ MED_attributes::
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
+      WAV_model = @[wav_model]
       history_n = 1
       history_option = nhours
       history_ymd = -999
diff --git a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
index bc17c35015..d3eca0d93a 100644
--- a/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
+++ b/tests/parm/nems.configure.hafs_atm_ocn_wav.IN
@@ -3,7 +3,7 @@
 ##############################################
 
 # ESMF #
-logKindFlag:            ESMF_LOGKIND_MULTI
+logKindFlag:            ESMF_LOGKIND_MULTI_ON
 
 # EARTH #
 EARTH_component_list: MED ATM OCN WAV
@@ -15,7 +15,7 @@ EARTH_attributes::
 MED_model:                      @[med_model]
 MED_petlist_bounds:             @[med_petlist_bounds]
 MED_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   ATM_model = @[atm_model]
   OCN_model = @[ocn_model]
@@ -33,7 +33,7 @@ MED_attributes::
 ATM_model:                      @[atm_model]
 ATM_petlist_bounds:             @[atm_petlist_bounds]
 ATM_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   mesh_atm = @[MESH_ATM]
   stop_n = @[FHMAX]
@@ -46,7 +46,7 @@ ATM_attributes::
 OCN_model:                      @[ocn_model]
 OCN_petlist_bounds:             @[ocn_petlist_bounds]
 OCN_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   cdf_impexp_freq = 3
   cpl_hour = 0
@@ -75,12 +75,12 @@ OCN_attributes::
 WAV_model:                      @[wav_model]
 WAV_petlist_bounds:             @[wav_petlist_bounds]
 WAV_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   OverwriteSlice = false
   merge_import = .true.
-  mask_value_water = 1
-  mask_value_land = 0
+  mesh_wav = @[MESH_WAV]
+  multigrid = @[MULTIGRID]
 ::
 
 # Run Sequence #
@@ -103,6 +103,7 @@ runSeq::
   MED med_phases_post_atm
   MED med_phases_post_ocn
   MED med_phases_post_wav
+  MED med_phases_restart_write
 @
 ::
 
@@ -125,7 +126,7 @@ ALLCOMP_attributes::
   restart_n = 6
   restart_option = nhours
   restart_ymd = -999
-  dbug_flag = 0
+  dbug_flag = 6
   use_coldstart = true
   orb_eccen = 1.e36
   orb_iyear = 2000
diff --git a/tests/parm/nems.configure.hafs_atm_wav.IN b/tests/parm/nems.configure.hafs_atm_wav.IN
index adb601027c..629deefec7 100644
--- a/tests/parm/nems.configure.hafs_atm_wav.IN
+++ b/tests/parm/nems.configure.hafs_atm_wav.IN
@@ -3,7 +3,7 @@
 ##############################################
 
 # ESMF #
-logKindFlag:            ESMF_LOGKIND_MULTI
+logKindFlag:            ESMF_LOGKIND_MULTI_ON
 
 # EARTH #
 EARTH_component_list: MED ATM WAV
@@ -15,7 +15,7 @@ EARTH_attributes::
 MED_model:                      @[med_model]
 MED_petlist_bounds:             @[med_petlist_bounds]
 MED_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   ATM_model = @[atm_model]
   WAV_model = @[wav_model]
@@ -32,7 +32,7 @@ MED_attributes::
 ATM_model:                      @[atm_model]
 ATM_petlist_bounds:             @[atm_petlist_bounds]
 ATM_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   mesh_atm = @[MESH_ATM]
   stop_n = @[FHMAX]
@@ -43,7 +43,7 @@ ATM_attributes::
 
 # OCN #
 OCN_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   cdf_impexp_freq = 3
   cpl_hour = 0
@@ -72,12 +72,12 @@ OCN_attributes::
 WAV_model:                      @[wav_model]
 WAV_petlist_bounds:             @[wav_petlist_bounds]
 WAV_attributes::
-  Verbosity = 1
+  Verbosity = 0
   Diagnostic = 0
   OverwriteSlice = false
   merge_import = .true.
-  mask_value_water = 1
-  mask_value_land = 0
+  mesh_wav = @[MESH_WAV]
+  multigrid = @[MULTIGRID]
 ::
 
 # Run Sequence #
@@ -94,6 +94,7 @@ runSeq::
   WAV -> MED :remapMethod=redist
   MED med_phases_post_atm
   MED med_phases_post_wav
+  MED med_phases_restart_write
 @
 ::
 
@@ -115,7 +116,7 @@ ALLCOMP_attributes::
   restart_n = 6
   restart_option = nhours
   restart_ymd = -999
-  dbug_flag = 20
+  dbug_flag = 6
   use_coldstart = true
   orb_eccen = 1.e36
   orb_iyear = 2000
diff --git a/tests/parm/ww3_shel.inp.IN b/tests/parm/ww3_shel.inp.IN
new file mode 100644
index 0000000000..f658fc5c8a
--- /dev/null
+++ b/tests/parm/ww3_shel.inp.IN
@@ -0,0 +1,357 @@
+$ -------------------------------------------------------------------- $
+$ WAVEWATCH III shel input file                                        $
+$ -------------------------------------------------------------------- $
+$ Define input to be used with F/T/C flag for use or nor or coupling and
+$ T/F flag for definition as a homogeneous field.
+$
+$ Include ice and mud parameters only if IC1/2/3/4 used :
+   F F     Water levels
+   @[INPUT_CURFLD]
+   T F     Winds
+   @[INPUT_ICEFLD]
+   F F     Atmospheric momentum
+   F F     Air density
+   F       Assimilation data : Mean parameters
+   F       Assimilation data : 1-D spectra
+   F       Assimilation data : 2-D spectra
+$
+$ Time frame of calculations ----------------------------------------- $
+$ - Starting time in yyyymmdd hhmmss format.
+$ - Ending time in yyyymmdd hhmmss format.
+$
+   @[RUN_BEG]
+   @[RUN_END]
+$
+$ IOSTYP
+   1
+$
+   @[RUN_BEG]   @[DTFLD]  @[RUN_END] @[GOFILETYPE]
+   N
+   @[OUTPARS_WAV]
+$
+   @[RUN_BEG]   @[DTPNT]  @[RUN_END] @[POFILETYPE]
+$
+$ Global output point data file for global wave ensembles
+$
+$ Retained only deep water buoys or so from general buoy file
+$ taken from multi_1/2
+$
+$ Key to data in file:
+$
+$   LON      Longitude, east positive
+$   LAT      Latitude
+$   NAME     Output point name C*10, no blanks in name allowed
+$   AH       Anemometer height, dummy value for none-data points
+$   TYPE     Buoy type indicator, used for plotting and postprocessing
+$             DAT      Data point
+$             XDT      Former data point
+$             BPT      Boundary data for external models.
+$             VBY      'Virtual buoy'
+$   SOURCE   Source of data point
+$             ENCAN    Environment Canada
+$             GOMOOS   Gulf of Maine OOS
+$             IDT      Irish Department of Transportation
+$             METFR    Meteo France
+$             NCEP     Boundary and other data points
+$             NDBC     National Data Buoy Center
+$             PRIV     Private and incidental data sources
+$             SCRIPPS  Scripps
+$             UKMO     UK Met Office
+$             PDES     Puertos del Estados
+$             SHOM     Service Hydrographique et Oceanographique de la Marine
+$             OCNOR    Fugro Oceanor
+$             WHOI     Woods Hole Oceanographic Institute
+$	      SKOREA   South Korea
+$             MVEW     Ministerie van Verkeer en Waterstaat
+$             CORMP    Coastal Ocean Research and Monitoring Program
+$             DIMAR    Direccion General Maritima (Columbia)
+$             BP       British Petroleum
+$   SCALE    Scale indicator for plotting of locations on map
+$            Point will only be plotted if SCALE =< DX in our
+$            GrADS scripts, DX is width of plot in logitude
+$
+$   DEptH    Depth in meters
+$
+$ Notes:
+$
+$  - The '$' at the first position identifies comments for WAVEWATCH III
+$    input.
+$  - The first three data columns are used by the forecats code, the other
+$    are used by postprocessing scripts.
+$
+$    LON       LAT       NAME     AH   TYPE  SOURCE  SCALE  DEPTH
+$ ---------------------------------------------------------------
+    -85.078   -19.425   '32012  '  -1   DAT  WHOI      360  4534
+    -90.000   -55.000   '34002  '  6.2  DAT  OCOBSI    360  4800
+    -72.522    34.502   '41001  '  4    DAT  NDBC      360  4556
+    -74.930    31.892   '41002  '  4    DAT  NDBC      360  3920
+    -79.099    32.501   '41004  '  4    DAT  NDBC      360  39
+    -80.868    31.400   '41008  '  5    DAT  NDBC      360  14.9
+    -80.185    28.508   '41009  '  4    DAT  NDBC      360  42
+    -78.485    28.878   '41010  '  4    DAT  NDBC      360  890
+    -77.743    33.436   '41013  '  4    DAT  NDBC      360  23.5
+    -78.477    33.837   '41024  '  2.95 DAT  CORMP     360  10
+    -75.363    35.025   '41025  '  4    DAT  NDBC      360  59.4
+    -79.624    32.803   '41029  '  2.95 DAT  CORMP     360  10
+    -80.406    32.279   '41033  '  2.95 DAT  CORMP     360  10
+    -77.362    33.988   '41037  '  2.95 DAT  CORMP     360  30
+    -77.715    34.141   '41038  '  2.95 DAT  CORMP     360  18
+    -53.045    14.554   '41040  '  4    DAT  NDBC      360  5112
+    -46.093    14.311   '41041  '  4    DAT  NDBC      360  3595
+    -64.830    21.124   '41043  '  4    DAT  NDBC      360  5271
+    -58.630    21.582   '41044  '  4    DAT  NDBC      360  5419
+    -68.384    23.822   '41046  '  4    DAT  NDBC      360  5549
+    -71.494    27.514   '41047  '  4    DAT  NDBC      360  5321
+    -69.585    31.838   '41048  '  4    DAT  NDBC      360  5340
+    -62.938    27.490   '41049  '  4    DAT  NDBC      360  5459
+    -65.004    18.257   '41051  '  4    DAT  CARICOOS  360  32
+    -64.763    18.249   '41052  '  4    DAT  CARICOOS  360  44
+    -65.464    18.261   '41056  '  4    DAT  CARICOOS  360  30
+    -65.157    18.476   '41058  '  4    DAT  CARICOOS  360  40
+    -51.017    14.824   '41060  '  -1   DAT  WHOI      360  5021
+    -75.095    35.778   '41062  '  3.5  DAT  UNC       360  36
+    -75.941    34.782   '41063  '  3.5  DAT  UNC       360  30
+    -76.949    34.207   '41064  '  2.95 DAT  CORMP     360  30
+    -78.015    33.721   '41108  '  -1   DAT  SIO       360  12.8
+    -77.717    34.141   '41110  '  -1   DAT  CORMP     360  17
+    -81.292    30.709   '41112  '  -1   DAT  SIO       360  15.54
+    -80.534    28.400   '41113  '  -1   DAT  SIO       360  9.8
+    -80.188    28.523   '41116  '  -1   DAT  SIO       360  41
+    -81.080    30.000   '41117  '  -1   DAT  USACE     360  24.4
+    -80.590    28.609   '41118  '  -1   DAT  SIO       360  7.3
+    -78.483    33.842   '41119  '  -1   DAT  CORMP     360  13
+    -76.946    34.213   '41159  '  -1   DAT  CORMP     360  30.5
+    -89.650    25.961   '42001  '  3.6  DAT  NDBC      360  3334
+    -93.758    26.091   '42002  '  5    DAT  NDBC      360  3125.1
+    -85.615    25.925   '42003  '  4    DAT  NDBC      360  3265
+    -87.551    30.064   '42012  '  4    DAT  NDBC      360  25.9
+    -95.350    27.906   '42019  '  5    DAT  NDBC      360  82.2
+    -96.693    26.968   '42020  '  4    DAT  NDBC      360  84.1
+    -83.741    27.505   '42022  '  3.1  DAT  COMPS     360  50
+    -83.086    26.010   '42023  '  3.1  DAT  COMPS     360  50
+    -83.475    25.171   '42026  '  3.2  DAT  COMPS     360  70
+    -94.413    29.232   '42035  '  4    DAT  NDBC      360  16.2
+    -84.516    28.501   '42036  '  4    DAT  NDBC      360  49.7
+    -86.008    28.788   '42039  '  4    DAT  NDBC      360  270
+    -88.226    29.208   '42040  '  4    DAT  NDBC      360  183
+    -94.899    28.982   '42043  '  4    DAT  TAMUNI    360  19
+    -96.500    26.217   '42045  '  4    DAT  TAMUNI    360  62
+    -94.037    27.890   '42046  '  4    DAT  TAMUNI    360  105
+    -93.597    27.897   '42047  '  4    DAT  TAMUNI    360  89
+    -93.941    22.124   '42055  '  4    DAT  NDBC      360  3624
+    -84.946    19.812   '42056  '  4    DAT  NDBC      360  4565
+    -81.422    16.908   '42057  '  4    DAT  NDBC      360  377
+    -74.560    14.775   '42058  '  4    DAT  NDBC      360  4150
+    -67.483    15.252   '42059  '  4    DAT  NDBC      360  4784
+    -63.354    16.413   '42060  '  4    DAT  NDBC      360  1507
+    -81.251    24.500   '42078  '  -1   DAT  CDIP      360  170
+    -81.242    24.535   '42079  '  -1   DAT  CDIP      360  99
+    -66.532    17.869   '42085  '  4    DAT  CARICOOS  360  18.9
+    -60.848    11.185   '42087  '  3.35 DAT  ICON      360  1266
+    -60.521    11.301   '42088  '  3.35 DAT  ICON      360  1266
+    -80.061    19.699   '42089  '  3.35 DAT  ICON      360  5726
+    -69.580    18.432   '42090  '  3.35 DAT  ICON      360  1188
+    -81.967    24.407   '42095  '  -1   DAT  USACE     360  100
+    -83.650    25.700   '42097  '  -1   DAT  USACE     360  81
+    -84.275    27.345   '42099  '  -1   DAT  SIO       360  93.9
+    -90.459    26.689   '42360  '  3    DAT  MURPHY    360  2539.9
+    -92.490    27.550   '42361  '  122  DAT  SHELL     360  871.7
+    -90.648    27.795   '42362  '  122  DAT  ENVEN     360  910
+    -89.220    28.160   '42363  '  122  DAT  SHELL     360  894
+    -88.090    29.060   '42364  '  122  DAT  SHELL     360  980.2
+    -90.283    27.207   '42369  '  60.4 DAT  BP        360  1371.9
+    -88.289    28.521   '42375  '  61   DAT  BP        360  1920.2
+    -94.898    26.129   '42390  '  -1   DAT  SHELL     360  2382.6
+    -90.027    27.196   '42392  '  -1   DAT  BP        360  2156.16
+    -89.240    28.157   '42394  '  100  DAT  SHELL     360  923.5
+    -90.792    26.404   '42395  '  3    DAT  SHELL     360  2941.9
+    -125.032   10.051   '43010  '  -1   DAT  WHOI      360  4769
+    -69.128    43.201   '44005  '  5    DAT  NDBC      360  180.7
+    -70.141    43.525   '44007  '  5    DAT  NDBC      360  26.5
+    -69.248    40.504   '44008  '  4    DAT  NDBC      360  74.7
+    -74.702    38.457   '44009  '  5    DAT  NDBC      360  30
+    -66.588    41.070   '44011  '  4    DAT  NDBC      360  88.4
+    -70.651    42.346   '44013  '  5    DAT  NDBC      360  64
+    -74.840    36.606   '44014  '  5    DAT  NDBC      360  47
+    -72.049    40.693   '44017  '  5    DAT  NDBC      360  48
+    -70.143    42.206   '44018  '  5    DAT  NDBC      360  41.5
+    -70.279    41.493   '44020  '  4    DAT  NDBC      360  14.3
+    -73.728    40.883   '44022  '  3.5  DAT  UCT       360  22.5
+    -65.912    42.327   '44024  '  4    DAT  NRCOOS    360  225
+    -73.164    40.251   '44025  '  5    DAT  NDBC      360  36.3
+    -67.300    44.283   '44027  '  5    DAT  NDBC      360  185.3
+    -70.566    42.523   '44029  '  4    DAT  NRCOOS    360  65
+    -70.426    43.179   '44030  '  4    DAT  NRCOOS    360  62
+    -69.355    43.715   '44032  '  4    DAT  NRCOOS    360  100
+    -68.996    44.055   '44033  '  4    DAT  NRCOOS    360  110
+    -68.112    44.103   '44034  '  4    DAT  NRCOOS    360  100
+    -67.876    43.497   '44037  '  4    DAT  NRCOOS    360  285
+    -73.580    40.956   '44040  '  3.5  DAT  UCT       360  18.3
+    -75.715    36.199   '44056  '  -1   DAT  USACE     360  17.4
+    -73.703    40.369   '44065  '  4    DAT  NDBC      360  25
+    -72.644    39.618   '44066  '  4    DAT  NDBC      360  78
+    -73.087    40.699   '44069  '  3    DAT  SBROOKU   360  46
+    -70.540    43.020   '44073  '  2.6  DAT  UNH       360  131
+    -75.421    36.001   '44086  '  -1   DAT  SIO       360  21
+    -74.838    36.612   '44088  '  -1   DAT  SIO       360  47
+    -75.334    37.757   '44089  '  -1   DAT  USACE     360  16.9
+    -70.329    41.840   '44090  '  -1   DAT  USGS      360  26
+    -73.769    39.778   '44091  '  -1   DAT  USACE     360  25.6
+    -75.492    36.872   '44093  '  -1   DAT  SIO       360  26.82
+    -75.330    35.750   '44095  '  -1   DAT  SIO       360  18.3
+    -75.809    37.023   '44096  '  -1   DAT  SIO       360  11.9
+    -71.127    40.969   '44097  '  -1   DAT  SIO       360  48.16
+    -70.168    42.798   '44098  '  -1   DAT  SIO       360  76.5
+    -75.720    36.914   '44099  '  -1   DAT  SIO       360  18.3
+    -75.594    36.260   '44100  '  -1   DAT  SIO       360  25.9
+    -62.000    42.260   '44137  '  5    DAT  ENCAN     360  4000
+    -57.100    44.240   '44139  '  5    DAT  ENCAN     360  1500
+    -64.020    42.500   '44150  '  5    DAT  ENCAN     360  1300
+    -63.400    44.500   '44258  '  5    DAT  ENCAN     360  58
+    -147.949   56.232   '46001  '  5    DAT  NDBC      360  4054
+    -130.537   42.612   '46002  '  4    DAT  NDBC      360  3413
+    -136.100   50.930   '46004  '  5    DAT  ENCAN     360  3600
+    -131.079   46.134   '46005  '  4    DAT  NDBC      360  2852
+    -137.397   40.782   '46006  '  4    DAT  NDBC      360  4378
+    -121.019   34.956   '46011  '  5    DAT  NDBC      360  464.8
+    -160.000   57.700   '46021  '  -1   DAT  NDBC      360  59
+    -120.967   34.714   '46023  '  10   DAT  NDBC      360  384.1
+    -119.200   33.000   '46024  '  -1   DAT  NDBC      360  1213
+    -119.053   33.763   '46025  '  4    DAT  NDBC      360  888
+    -121.857   35.703   '46028  '  5    DAT  NDBC      360  1048
+    -177.708   57.018   '46035  '  5    DAT  NDBC      360  3687
+    -122.398   36.785   '46042  '  5    DAT  NDBC      360  1645.9
+    -119.506   32.404   '46047  '  4    DAT  NDBC      360  1394
+    -120.477   34.265   '46054  '  4    DAT  NDBC      360  469.4
+    -129.951   38.094   '46059  '  4    DAT  NDBC      360  4628
+    -146.805   60.584   '46060  '  5    DAT  NDBC      360  445
+    -154.987   52.765   '46066  '  5    DAT  NDBC      360  4460
+    -120.213   33.677   '46069  '  4    DAT  NDBC      360  977.8
+     175.153   55.082   '46070  '  5    DAT  NDBC      360  3835
+     179.012   51.125   '46071  '  5    DAT  NDBC      360  1681
+    -172.088   51.672   '46072  '  5    DAT  NDBC      360  3572
+    -172.001   55.031   '46073  '  5    DAT  NDBC      360  3051.5
+    -160.817   53.983   '46075  '  5    DAT  NDBC      360  2392.7
+    -147.990   59.502   '46076  '  5    DAT  NDBC      360  195.1
+    -152.582   55.556   '46078  '  5    DAT  NDBC      360  5380
+    -150.042   57.947   '46080  '  5    DAT  NDBC      360  254.5
+    -143.372   59.681   '46082  '  5    DAT  NDBC      360  300
+    -137.997   58.300   '46083  '  5    DAT  NDBC      360  136
+    -136.102   56.622   '46084  '  5    DAT  NDBC      360  1158
+    -142.882   55.883   '46085  '  4    DAT  NDBC      360  3721
+    -118.052   32.499   '46086  '  4    DAT  NDBC      360  1844.7
+    -125.771   45.925   '46089  '  5    DAT  NDBC      360  2293.3
+    -122.029   36.751   '46092  '  4    DAT  MBARI     360  1000
+    -122.351   36.723   '46114  '  -1   DAT  SIO       360  1463
+    -131.220   51.830   '46147  '  5    DAT  ENCAN     360  2000
+    -131.100   53.620   '46183  '  5    DAT  ENCAN     360  65
+    -138.850   53.910   '46184  '  5    DAT  ENCAN     360  3200
+    -129.790   52.420   '46185  '  5    DAT  ENCAN     360  230
+    -128.770   51.380   '46204  '  -1   DAT  ENCAN     360  222
+    -134.320   54.190   '46205  '  5    DAT  ENCAN     360  2675
+    -126.000   48.840   '46206  '  5    DAT  ENCAN     360  72
+    -129.920   50.870   '46207  '  5    DAT  ENCAN     360  2125
+    -132.690   52.520   '46208  '  5    DAT  ENCAN     360  2950
+    -123.472   37.950   '46214  '  -1   DAT  SIO       360  550
+    -120.783   34.454   '46218  '  -1   DAT  SIO       360  548.6
+    -119.882   33.225   '46219  '  -1   DAT  SIO       360  274.3
+    -118.634   33.855   '46221  '  -1   DAT  SIO       360  370
+    -118.317   33.618   '46222  '  -1   DAT  SIO       360  457
+    -117.391   32.933   '46225  '  -1   DAT  SIO       360  549
+    -117.370   32.747   '46231  '  -1   DAT  SIO       360  201.17
+    -117.421   32.530   '46232  '  -1   DAT  SIO       360  1143
+    -117.169   32.570   '46235  '  -1   DAT  SIO       360  21
+    -122.096   36.343   '46239  '  -1   DAT  SIO       360  369
+    -145.200   50.033   '46246  '  -1   DAT  SIO       360  4252
+    -119.559   33.761   '46251  '  -1   DAT  SIO       360  1920
+    -118.181   33.576   '46253  '  -1   DAT  SIO       360  66
+    -117.267   32.868   '46254  '  -1   DAT  SIO       360  38.71
+    -119.651   33.400   '46255  '  -1   DAT  SIO       360  105
+    -118.201   33.700   '46256  '  -1   DAT  SIO       360  23.25
+    -120.766   34.439   '46257  '  -1   DAT  SIO       360  576.07
+    -117.501   32.752   '46258  '  -1   DAT  SIO       360  588.6
+    -121.497   34.767   '46259  '  -1   DAT  USACE     360  646.8
+    -119.004   33.704   '46262  '  -1   DAT  SIO       360  905
+    -151.695   57.479   '46264  '  -1   DAT  SIO       360  86
+    -165.475   64.473   '46265  '  -1   DAT  SIO       360  18.2
+    -153.781   23.535   '51000  '  5    DAT  NDBC      360  4811
+    -162.000   24.453   '51001  '  4    DAT  NDBC      360  4895
+    -157.742   17.043   '51002  '  4    DAT  NDBC      360  4948
+    -160.662   19.172   '51003  '  4    DAT  NDBC      360  4943.3
+    -152.364   17.604   '51004  '  4    DAT  NDBC      360  4998
+    -162.075   24.361   '51101  '  4    DAT  NDBC      360  4849
+    -158.117   21.671   '51201  '  -1   DAT  SIO       360  200
+    -157.678   21.415   '51202  '  -1   DAT  SIO       360  89
+    -157.010   20.788   '51203  '  -1   DAT  SIO       360  201
+    -158.124   21.281   '51204  '  -1   DAT  SIO       360  300
+    -156.425   21.018   '51205  '  -1   DAT  SIO       360  200
+    -154.970   19.780   '51206  '  -1   DAT  SIO       360  345
+    -157.752   21.477   '51207  '  -1   DAT  SIO       360  81
+    -159.574   22.285   '51208  '  -1   DAT  SIO       360  200
+    -170.493  -14.264   '51209  '  -1   DAT  SIO       360  82
+    -157.756   21.477   '51210  '  -1   DAT  SIO       360  80
+    -157.959   21.297   '51211  '  -1   DAT  SIO       360  35
+    -158.149   21.323   '51212  '  -1   DAT  SIO       360  280
+    -157.003   20.750   '51213  '  -1   DAT  SIO       360  235
+     144.788   13.354   '52200  '  -1   DAT  SIO       360  200
+     171.392   7.083    '52201  '  -1   DAT  SIO       360  540
+     144.812   13.684   '52202  '  -1   DAT  SIO       360  510
+     145.662   15.268   '52211  '  -1   DAT  SIO       360  487.68
+     134.667   7.630    '52212  '  -1   DAT  SIO       360  97
+    -5.000     45.230   '62001  '  3    DAT  UKMO      360  4556
+    -12.430    48.720   '62029  '  3    DAT  UKMO      360  3575
+    -4.400     50.000   '62050  '  -1   DAT  UKMO      360  53
+    -2.900     49.900   '62103  '  14   DAT  UKMO      360  18
+    -12.570    55.420   '62105  '  3    DAT  UKMO      360  2899
+    -6.100     50.102   '62107  '  14   DAT  UKMO      360  61
+     0.000     58.300   '62114  '  -1   DAT  PRIVATE   360  142
+     0.700     54.000   '62127  '  -1   DAT  PRIVATE   360  39
+     1.700     53.400   '62144  '  -1   DAT  PRIVATE   360  16
+     2.800     53.102   '62145  '  -1   DAT  PRIVATE   360  26
+     2.100     57.200   '62146  '  -1   DAT  PRIVATE   360  98
+     1.500     53.600   '62148  '  -1   DAT  PRIVATE   360  16
+     1.100     53.700   '62149  '  -1   DAT  PRIVATE   360  16
+    -8.470     47.550   '62163  '  3    DAT  UKMO      360  4000
+     1.100     54.000   '62165  '  -1   DAT  PRIVATE   360  41
+     0.000     50.400   '62305  '  14   DAT  UKMO      360  39
+     1.500     59.500   '63110  '  -1   DAT  PRIVATE   360  117
+     1.000     61.100   '63112  '  -1   DAT  PRIVATE   360  156
+     1.708     61.000   '63113  '  -1   DAT  PRIVATE   360  156
+     1.300     61.600   '63115  '  -1   DAT  PRIVATE   360  156
+     1.100     61.400   '63117  '  -1   DAT  PRIVATE   360  156
+    -11.420    59.070   '64045  '  3    DAT  UKMO      360  1935
+    -4.167     60.483   '64046  '  3    DAT  UKMO      360  230
+$
+$ ---------------------------------------------------------------
+$ End of list
+$
+$ ---------------------------------------------------------------
+$
+     0.00    0.00  'STOPSTRING'  999.   XXX  NCEP       0
+$
+$ Type 3 : Output along track.
+$          Flag for formatted input file.
+$                         The data files are track_i.ww3 and
+$                         track_o.ww3, see w3iotr.ftn for ad. doc.
+$
+   @[RUN_BEG]      0  @[RUN_END]
+$
+$ Type 4 : Restart files (no additional data required).
+$                               The data file is restartN.ww3, see
+$                               w3iors.ftn for additional doc.
+$          Flag for second restart (data server mode)
+$          Flag for extra fields in the restart file (coupling restart)
+$
+$ Keep next two lines formatting as is to allow proper parsing
+   @[RUN_BEG]   @[DTRST]  @[RUN_END] T
+@[RUN_BEG]   @[DT_2_RST]  @[RUN_END]
+$
+   @[RUN_BEG]      0  @[RUN_END]
+$
+   @[RUN_BEG]      0  @[RUN_END]
+$
+  'the_end'  0
+$
+  'STP'
+$
+$ End of input file
diff --git a/tests/rt.conf b/tests/rt.conf
index 450df859c9..6d43c553f6 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -2,26 +2,22 @@
 # S2S tests                                                                                                                                                                       #
 ###################################################################################################################################################################################
 
-COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v17_coupled_p8                                   | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | cpld_control_p8                                                                                                         | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray wcoss2.intel               |     |
-RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray wcoss2.intel jet.intel     |     |
-RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray wcoss2.intel               |     |
-
-RUN     | cpld_bmark_p8                                                                                                           | - wcoss_cray wcoss2.intel jet.intel     | fv3 |
-
-# Waves off for restart and debug tests
-RUN     | cpld_control_c96_p8                                                                                                     | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | cpld_restart_c96_p8                                                                                                     | - wcoss_cray wcoss2.intel               |     | cpld_control_c96_p8
-
-RUN     | cpld_control_c192_p8                                                                                                    | - wcoss_cray wcoss2.intel jet.intel     | fv3 |
-RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss_cray wcoss2.intel jet.intel     |     | cpld_control_c192_p8
-
-RUN     | cpld_control_c384_p8                                                                                                    | - wcoss_cray wcoss2.intel jet.intel     | fv3 |
-RUN     | cpld_restart_c384_p8                                                                                                    | - wcoss_cray wcoss2.intel jet.intel     |     | cpld_control_c384_p8
-
-COMPILE | -DAPP=S2SA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              | - wcoss_cray wcoss2.intel               | fv3 |
-RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray wcoss2.intel               | fv3 |
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                        | - wcoss_cray  wcoss2.intel              | fv3 |
+RUN     | cpld_control_p8                                                                                                         | - wcoss_cray  wcoss2.intel              | fv3 |
+RUN     | cpld_restart_p8                                                                                                         | - wcoss_cray  wcoss2.intel              |     | cpld_control_p8
+RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray  wcoss2.intel              |     |
+RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray  wcoss2.intel jet.intel    |     |
+RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray  wcoss2.intel              |     |
+#RUN     | cpld_multigrid_p8                                                                                                       | - wcoss_cray  wcoss2.intel              |     |
+
+RUN     | cpld_control_c192_p8                                                                                                    | - wcoss_cray  wcoss2.intel jet.intel    | fv3 |
+RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss_cray  wcoss2.intel jet.intel    |     | cpld_control_c192_p8
+
+RUN     | cpld_bmark_p8                                                                                                           | - wcoss_cray  wcoss2.intel jet.intel    | fv3 |
+RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss_cray  wcoss2.intel jet.intel    |     | cpld_bmark_p8
+
+COMPILE | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                             | - wcoss_cray  wcoss2.intel              | fv3 |
+RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray  wcoss2.intel              | fv3 |
 
 ###################################################################################################################################################################################
 # ATM tests                                                                                                                                                                       #
diff --git a/tests/rt.sh b/tests/rt.sh
index 098687f785..642aba3cdc 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220519
+BL_DATE=20220531
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]] || [[ $MACHINE_ID = wcoss2.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
@@ -493,7 +493,7 @@ else
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
-INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113
+INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220418
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}
 
 shift $((OPTIND-1))
diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
index e98cb9cddf..23355c9da0 100644
--- a/tests/rt_gnu.conf
+++ b/tests/rt_gnu.conf
@@ -60,11 +60,10 @@ RUN     | control_wam_debug
 # S2S tests                                                                                                                                                      #
 ##################################################################################################################################################################
 
-# Waves off
-COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                          |                | fv3         |
-RUN     | cpld_control_c96_noaero_p8                                                                                              |                | fv3         |
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                         |                | fv3         |
+RUN     | cpld_control_noaero_p8                                                                                                  |                | fv3         |
 
-COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                               |                | fv3         |
+COMPILE | -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                              |                | fv3         |
 RUN     | cpld_debug_noaero_p8                                                                                                    |                | fv3         |
 
 ##################################################################################################################################################################
diff --git a/tests/run_test.sh b/tests/run_test.sh
index ef6f5fedf1..d55c4223c7 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -252,11 +252,16 @@ cp ${PATHRT}/parm/fd_nems.yaml fd_nems.yaml
 source ./fv3_run
 
 if [[ $CPLWAV == .true. ]]; then
-  atparse < ${PATHRT}/parm/ww3_multi.inp.IN > ww3_multi.inp
+  if [[ $MULTIGRID = 'true' ]]; then
+    atparse < ${PATHRT}/parm/ww3_multi.inp.IN > ww3_multi.inp
+  else
+    atparse < ${PATHRT}/parm/ww3_shel.inp.IN > ww3_shel.inp
+  fi
 fi
 
 if [[ $CPLCHM == .true. ]]; then
   cp ${PATHRT}/parm/gocart/*.rc .
+  atparse < ${PATHRT}/parm/gocart/AERO_HISTORY.rc.IN > AERO_HISTORY.rc
 fi
 
 if [[ $DATM_CDEPS = 'true' ]] || [[ $S2S = 'true' ]]; then
diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
index a2acc0c1dc..bb49d7acfe 100644
--- a/tests/tests/cpld_2threads_p8
+++ b/tests/tests/cpld_2threads_p8
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +54,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -79,12 +78,8 @@ export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
index 61caec1abf..1106661166 100644
--- a/tests/tests/cpld_bmark_p8
+++ b/tests/tests/cpld_bmark_p8
@@ -1,15 +1,13 @@
 #
 #  cpld_bmark_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-GOCART-WW3 system - C384L127 MX025 - Benchmark P8 test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P8 test"
 
 export CNTL_DIR="cpld_bmark_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
                    gocart.inst_aod.20130401_0600z.nc4 \
-                   20130401.060000.out_grd.gwes_30m \
-                   20130401.060000.out_pnt.points \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -47,7 +45,9 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
                    RESTART/iced.2013-04-01-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc"
+                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
+                   20130401.060000.out_pnt.ww3 \
+                   20130401.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -61,22 +61,24 @@ export BMIC=.true.
 
 export DAYS=0.25
 export FHMAX=6
-export RESTART_N=`expr ${FHMAX} - ${FHROT}`
+export RESTART_N=3
 export RESTART_INTERVAL="${RESTART_N} -1"
-
-export WLCLK=45
+export OUTPUT_FH="3 -1"
+export FHZERO=3
 
 export DOMAINS_STACK_SIZE=16000000
 
-export TASKS=$TASKS_cpl_bmrk_aero
-export INPES=$INPES_cpl_bmrk_aero
-export JNPES=$JNPES_cpl_bmrk_aero
-export THRD=$THRD_cpl_bmrk_aero
-export WRTTASK_PER_GROUP=$WPG_cpl_bmrk_aero
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
+
+export TASKS=$TASKS_cpl_bmrk
+export INPES=$INPES_cpl_bmrk
+export JNPES=$JNPES_cpl_bmrk
+export THRD=$THRD_cpl_bmrk
+export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
 
-OCN_tasks=$OCN_tasks_cpl_bmrk_aero
-ICE_tasks=$ICE_tasks_cpl_bmrk_aero
-WAV_tasks=$WAV_tasks_cpl_bmrk_aero
+OCN_tasks=$OCN_tasks_cpl_bmrk
+ICE_tasks=$ICE_tasks_cpl_bmrk
+WAV_tasks=$WAV_tasks_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -91,7 +93,7 @@ export OCNRES=025
 export ICERES=0.25
 export NX_GLB=1440
 export NY_GLB=1080
-export NPROC_ICE=${ICE_tasks}
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
@@ -102,10 +104,7 @@ export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
 
-export CPLCHM=.true.
-
 # nems.configure
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
 export coupling_interval_slow_sec=${DT_THERM_MOM6}
 export coupling_interval_fast_sec=${DT_ATMOS}
 
@@ -116,6 +115,8 @@ export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
 export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
 export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
 export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
+export MOM6_RIVER_RUNOFF=True
+export MOM6_RESTART_SETTING=r
 
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"
@@ -131,20 +132,8 @@ export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 
-export MOM6_RIVER_RUNOFF=True
-export MOM6_RESTART_SETTING=r
-
-export WW3GRIDLINE="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
-export WW3RSTDTHR=${FHMAX}
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export OUT_BEG=$RUN_BEG
-export OUT_END=$RUN_END
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
-export RST_END=$RUN_END
-export RST_2_END=$RUN_END
 
 export FV3_RUN=cpld_control_run.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
index ef4083c513..967c8824aa 100644
--- a/tests/tests/cpld_control_c192_p8
+++ b/tests/tests/cpld_control_c192_p8
@@ -1,23 +1,23 @@
 #
 #  cpld_control_c192_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C192 MX050 - P8 test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
 
 export CNTL_DIR="cpld_control_c192_p8"
 
-export LIST_FILES="sfcf036.tile1.nc \
-                   sfcf036.tile2.nc \
-                   sfcf036.tile3.nc \
-                   sfcf036.tile4.nc \
-                   sfcf036.tile5.nc \
-                   sfcf036.tile6.nc \
-                   atmf036.tile1.nc \
-                   atmf036.tile2.nc \
-                   atmf036.tile3.nc \
-                   atmf036.tile4.nc \
-                   atmf036.tile5.nc \
-                   atmf036.tile6.nc \
-                   gocart.inst_aod.20210323_1800z.nc4 \
+export LIST_FILES="sfcf030.tile1.nc \
+                   sfcf030.tile2.nc \
+                   sfcf030.tile3.nc \
+                   sfcf030.tile4.nc \
+                   sfcf030.tile5.nc \
+                   sfcf030.tile6.nc \
+                   atmf030.tile1.nc \
+                   atmf030.tile2.nc \
+                   atmf030.tile3.nc \
+                   atmf030.tile4.nc \
+                   atmf030.tile5.nc \
+                   atmf030.tile6.nc \
+                   gocart.inst_aod.20210323_1200z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -51,16 +51,20 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-23-64800.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
+                   RESTART/iced.2021-03-23-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc \
+                   20210323.120000.out_grd.ww3 \
+                   20210323.120000.out_pnt.ww3 "
 
 export_fv3
 export_cpl
 
-export DAYS=1.5
-export FHMAX=36
-export RESTART_N=12
+export DAYS=1.25
+export FHMAX=30
+export RESTART_N=15
 export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH="0 15 30"
+export FHZERO=3
 
 export DOMAINS_STACK_SIZE=16000000
 
@@ -72,6 +76,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
 OCN_tasks=$OCN_tasks_cpl_c192
 ICE_tasks=$ICE_tasks_cpl_c192
+WAV_tasks=$WAV_tasks_cpl_c192
 
 # atm/ocn/ice resolution
 export ATMRES=C192
@@ -123,12 +128,4 @@ export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c192}
 export DT_INNER=${DT_INNER_c192}
 
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
deleted file mode 100644
index 8ec4e40198..0000000000
--- a/tests/tests/cpld_control_c384_p8
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-#  cpld_control_c384_p8 test
-#
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 test "
-
-export CNTL_DIR="cpld_control_c384_p8"
-
-export LIST_FILES="sfcf006.nc \
-                   atmf006.nc \
-                   gocart.inst_aod.20210322_1200z.nc4 \
-                   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 \
-                   RESTART/MOM.res.nc \
-                   RESTART/MOM.res_1.nc \
-                   RESTART/MOM.res_2.nc \
-                   RESTART/MOM.res_3.nc \
-                   RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
-
-export_fv3
-export_cpl
-
-export DAYS=0.25
-export FHMAX=6
-export RESTART_N=3
-export RESTART_INTERVAL="${RESTART_N} -1"
-export OUTPUT_FH="3 -1"
-export FHZERO=3
-
-export DOMAINS_STACK_SIZE=16000000
-
-export TASKS=$TASKS_cpl_c384
-export INPES=$INPES_cpl_c384
-export JNPES=$JNPES_cpl_c384
-export THRD=$THRD_cpl_c384
-export WRTTASK_PER_GROUP=$WPG_cpl_c384
-
-OCN_tasks=$OCN_tasks_cpl_c384
-ICE_tasks=$ICE_tasks_cpl_c384
-
-# atm/ocn/ice resolution
-export ATMRES=C384
-export NPX=385
-export NPY=385
-export IMO=1536
-export JMO=768
-export OUTPUT_GRID="'gaussian_grid'"
-export ATMTILESIZE=`expr $NPX - 1`
-
-export OCNRES=025
-export ICERES=0.25
-export NX_GLB=1440
-export NY_GLB=1080
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-# set component and coupling timesteps
-export DT_ATMOS=300
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6=900
-export DT_THERM_MOM6=1800
-
-# nems.configure
-export coupling_interval_slow_sec=${DT_THERM_MOM6}
-export coupling_interval_fast_sec=${DT_ATMOS}
-
-# resolution dependent files
-export MOM_INPUT=MOM_input_template_${OCNRES}
-export MESHOCN_ICE=mesh.mx${OCNRES}.nc
-export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
-export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
-export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
-export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
-export MOM6_RIVER_RUNOFF=True
-
-export FNALBC="'C384.snowfree_albedo.tileX.nc'"
-export FNALBC2="'C384.facsf.tileX.nc'"
-export FNTG3C="'C384.substrate_temperature.tileX.nc'"
-export FNVEGC="'C384.vegetation_greenness.tileX.nc'"
-export FNVETC="'C384.vegetation_type.tileX.nc'"
-export FNSOTC="'C384.soil_type.tileX.nc'"
-export FNVMNC="'C384.vegetation_greenness.tileX.nc'"
-export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
-export FNSLPC="'C384.slope_type.tileX.nc'"
-export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
-
-export CDMBWD=${CDMBWD_c384}
-export DT_INNER=${DT_INNER_c384}
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
-export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c96_noaero_p8 b/tests/tests/cpld_control_noaero_p8
similarity index 79%
rename from tests/tests/cpld_control_c96_noaero_p8
rename to tests/tests/cpld_control_noaero_p8
index 0c57934c86..e91fede883 100644
--- a/tests/tests/cpld_control_c96_noaero_p8
+++ b/tests/tests/cpld_control_noaero_p8
@@ -1,10 +1,10 @@
 #
-#  cpld_control C96 noaero P8 test
+#  cpld_control noaero P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
-export CNTL_DIR="cpld_control_c96_noaero_p8"
+export CNTL_DIR="cpld_control_noaero_p8"
 
 export LIST_FILES="sfcf021.tile1.nc \
                    sfcf021.tile2.nc \
@@ -64,9 +64,9 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
-
-#TODO: add comparison of CA restart files?
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -75,29 +75,13 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export TASKS=$TASKS_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-OCN_tasks=$OCN_tasks_cpl_c96
-ICE_tasks=$ICE_tasks_cpl_c96
-
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-export eps_imesh=2.5e-1
-
+export CPLCHM=.false.
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export DIAG_TABLE=diag_table_template
-export NEMS_CONFIGURE=nems.configure.cpld.IN
+export FIELD_TABLE=field_table_thompson_noaero_tke
+export NEMS_CONFIGURE=nems.configure.cpld_noaero.IN
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index 40c27e2c5b..cdc4d71120 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -30,6 +30,7 @@ export LIST_FILES="sfcf021.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -65,28 +66,18 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
-OCN_tasks=$OCN_tasks_cpl_dflt
-ICE_tasks=$ICE_tasks_cpl_dflt
-WAV_tasks=$WAV_tasks_cpl_dflt
-
 export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
index 74f2d6c82b..8d40bc6223 100644
--- a/tests/tests/cpld_debug_noaero_p8
+++ b/tests/tests/cpld_debug_noaero_p8
@@ -2,22 +2,22 @@
 #  cpld_debug_noaero_p8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P8 debug"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - P8 debug"
 
 export CNTL_DIR="cpld_debug_noaero_p8"
 
-export LIST_FILES="sfcf006.tile1.nc \
-                   sfcf006.tile2.nc \
-                   sfcf006.tile3.nc \
-                   sfcf006.tile4.nc \
-                   sfcf006.tile5.nc \
-                   sfcf006.tile6.nc \
-                   atmf006.tile1.nc \
-                   atmf006.tile2.nc \
-                   atmf006.tile3.nc \
-                   atmf006.tile4.nc \
-                   atmf006.tile5.nc \
-                   atmf006.tile6.nc \
+export LIST_FILES="sfcf003.tile1.nc \
+                   sfcf003.tile2.nc \
+                   sfcf003.tile3.nc \
+                   sfcf003.tile4.nc \
+                   sfcf003.tile5.nc \
+                   sfcf003.tile6.nc \
+                   atmf003.tile1.nc \
+                   atmf003.tile2.nc \
+                   atmf003.tile3.nc \
+                   atmf003.tile4.nc \
+                   atmf003.tile5.nc \
+                   atmf003.tile6.nc \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -51,40 +51,27 @@ export LIST_FILES="sfcf006.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
+                   RESTART/iced.2021-03-22-32400.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
+                   20210322.090000.out_pnt.ww3 \
+                   20210322.090000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
-export DAYS=0.25
-export FHMAX=6
+export FHMAX=3
+export DAYS=0.125
 
 export RESTART_N=${FHMAX}
-export eps_imesh=2.5e-1
-
-export TASKS=$TASKS_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-OCN_tasks=$OCN_tasks_cpl_c96
-ICE_tasks=$ICE_tasks_cpl_c96
-
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export DIAG_TABLE=diag_table_template
-export NEMS_CONFIGURE=nems.configure.cpld.IN
+export OUTPUT_FH="3 -1"
 
+export CPLCHM=.false.
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
+
+export DIAG_TABLE=diag_table_template
+export FIELD_TABLE=field_table_thompson_noaero_tke
+export NEMS_CONFIGURE=nems.configure.cpld_noaero.IN
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
index 47179318a6..12e74090cd 100644
--- a/tests/tests/cpld_debug_p8
+++ b/tests/tests/cpld_debug_p8
@@ -2,23 +2,23 @@
 #  cpld_debug_p8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100 - P8 debug"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 P8 debug"
 
 export CNTL_DIR="cpld_debug_p8"
 
-export LIST_FILES="sfcf006.tile1.nc \
-                   sfcf006.tile2.nc \
-                   sfcf006.tile3.nc \
-                   sfcf006.tile4.nc \
-                   sfcf006.tile5.nc \
-                   sfcf006.tile6.nc \
-                   atmf006.tile1.nc \
-                   atmf006.tile2.nc \
-                   atmf006.tile3.nc \
-                   atmf006.tile4.nc \
-                   atmf006.tile5.nc \
-                   atmf006.tile6.nc \
-                   gocart.inst_aod.20210322_1200z.nc4 \
+export LIST_FILES="sfcf003.tile1.nc \
+                   sfcf003.tile2.nc \
+                   sfcf003.tile3.nc \
+                   sfcf003.tile4.nc \
+                   sfcf003.tile5.nc \
+                   sfcf003.tile6.nc \
+                   atmf003.tile1.nc \
+                   atmf003.tile2.nc \
+                   atmf003.tile3.nc \
+                   atmf003.tile4.nc \
+                   atmf003.tile5.nc \
+                   atmf003.tile6.nc \
+                   gocart.inst_aod.20210322_0900z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -52,42 +52,22 @@ export LIST_FILES="sfcf006.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
+                   RESTART/iced.2021-03-22-32400.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc \
+                   20210322.090000.out_pnt.ww3 \
+                   20210322.090000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
-export DAYS=0.25
-export FHMAX=6
-
+export FHMAX=3
+export DAYS=0.125
 export RESTART_N=${FHMAX}
-export eps_imesh=2.5e-1
-export TOPOEDITS=ufs.topo_edits_011818.nc
-export MOM6_ALLOW_LANDMASK_CHANGES=True
-
-export TASKS=$TASKS_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
+export OUTPUT_FH="3 -1"
+export AOD_FRQ=030000
 
-OCN_tasks=$OCN_tasks_cpl_c96
-ICE_tasks=$ICE_tasks_cpl_c96
-
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
index 39e95ec7dc..105be37e7d 100644
--- a/tests/tests/cpld_decomp_p8
+++ b/tests/tests/cpld_decomp_p8
@@ -1,5 +1,5 @@
 #
-#  cpld_decomp P8 test
+#  cpld_control P8 test
 #
 
 export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - decomp test"
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +54,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -74,17 +73,13 @@ OCN_tasks=$OCN_tasks_cpl_dcmp
 ICE_tasks=$ICE_tasks_cpl_dcmp
 WAV_tasks=$WAV_tasks_cpl_dcmp
 
-export NPROC_ICE=${ICE_tasks}
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
index 11bf3a64a1..f1cdd8e83c 100644
--- a/tests/tests/cpld_mpi_p8
+++ b/tests/tests/cpld_mpi_p8
@@ -2,7 +2,7 @@
 #  cpld_mpi P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - change mpi task test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 MPI-task test"
 
 export CNTL_DIR="cpld_control_p8"
 
@@ -18,6 +18,7 @@ export LIST_FILES="sfcf024.tile1.nc \
                    atmf024.tile4.nc \
                    atmf024.tile5.nc \
                    atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -53,10 +54,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
-                   gocart.inst_aod.20210323_0600z.nc4 \
-                   20210323.060000.out_grd.glo_1deg \
-                   20210323.060000.out_pnt.points \
-                   20210323.060000.restart.glo_1deg"
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -74,7 +73,7 @@ OCN_tasks=$OCN_tasks_cpl_mpi
 ICE_tasks=$ICE_tasks_cpl_mpi
 WAV_tasks=$WAV_tasks_cpl_mpi
 
-export NPROC_ICE=${ICE_tasks}
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
@@ -83,8 +82,4 @@ export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_multigrid_p8
similarity index 64%
rename from tests/tests/cpld_control_c96_p8
rename to tests/tests/cpld_multigrid_p8
index db4ac9d9ad..869ec7bff4 100644
--- a/tests/tests/cpld_control_c96_p8
+++ b/tests/tests/cpld_multigrid_p8
@@ -1,24 +1,12 @@
 #
-#  cpld_control C96 P8 test
+#  cpld_multigrid P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 multigrid test"
 
-export CNTL_DIR="cpld_control_c96_p8"
+export CNTL_DIR="cpld_control_p8"
 
-export LIST_FILES="sfcf021.tile1.nc \
-                   sfcf021.tile2.nc \
-                   sfcf021.tile3.nc \
-                   sfcf021.tile4.nc \
-                   sfcf021.tile5.nc \
-                   sfcf021.tile6.nc \
-                   atmf021.tile1.nc \
-                   atmf021.tile2.nc \
-                   atmf021.tile3.nc \
-                   atmf021.tile4.nc \
-                   atmf021.tile5.nc \
-                   atmf021.tile6.nc \
-                   sfcf024.tile1.nc \
+export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
                    sfcf024.tile3.nc \
                    sfcf024.tile4.nc \
@@ -65,40 +53,16 @@ export LIST_FILES="sfcf021.tile1.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
-
-#TODO: add comparison of CA restart files?
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
-export RESTART_N=12
-export RESTART_INTERVAL="${RESTART_N} -1"
-export OUTPUT_FH='0 21 24'
-
-export TASKS=$TASKS_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-OCN_tasks=$OCN_tasks_cpl_c96
-ICE_tasks=$ICE_tasks_cpl_c96
+export MULTIGRID=true
 
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_bmark_p8
similarity index 81%
rename from tests/tests/cpld_restart_c384_p8
rename to tests/tests/cpld_restart_bmark_p8
index a409c090ca..1bfc89ec0d 100644
--- a/tests/tests/cpld_restart_c384_p8
+++ b/tests/tests/cpld_restart_bmark_p8
@@ -1,13 +1,13 @@
 #
-#  cpld_restart_c384_p8_aero test
+#  cpld_restart_bmark_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C384L127 MX025 - P8 restart"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - restart test "
 
-export CNTL_DIR="cpld_control_c384_p8"
+export CNTL_DIR="cpld_bmark_p8"
 
 export LIST_FILES="sfcf006.nc \
                    atmf006.nc \
-                   gocart.inst_aod.20210322_1200z.nc4 \
+                   gocart.inst_aod.20130401_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -44,12 +44,21 @@ export LIST_FILES="sfcf006.nc \
                    RESTART/MOM.res_1.nc \
                    RESTART/MOM.res_2.nc \
                    RESTART/MOM.res_3.nc \
-                   RESTART/iced.2021-03-22-43200.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc"
+                   RESTART/iced.2013-04-01-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
+                   20130401.060000.out_pnt.ww3 \
+                   20130401.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
 
+export SYEAR=2013
+export SMONTH=04
+export SDAY=01
+export SHOUR=00
+export SECS=`expr $SHOUR \* 3600`
+export BMIC=.true.
+
 export DAYS=0.25
 export FHMAX=6
 export FHROT=3
@@ -61,16 +70,18 @@ export DOMAINS_STACK_SIZE=16000000
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
-export TASKS=$TASKS_cpl_c384
-export INPES=$INPES_cpl_c384
-export JNPES=$JNPES_cpl_c384
-export THRD=$THRD_cpl_c384
-export WRTTASK_PER_GROUP=$WPG_cpl_c384
+export TASKS=$TASKS_cpl_bmrk
+export INPES=$INPES_cpl_bmrk
+export JNPES=$JNPES_cpl_bmrk
+export THRD=$THRD_cpl_bmrk
+export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
 
-OCN_tasks=$OCN_tasks_cpl_c384
-ICE_tasks=$ICE_tasks_cpl_c384
+OCN_tasks=$OCN_tasks_cpl_bmrk
+ICE_tasks=$ICE_tasks_cpl_bmrk
+WAV_tasks=$WAV_tasks_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -108,6 +119,7 @@ export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
 export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
 export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
 export MOM6_RIVER_RUNOFF=True
+export MOM6_RESTART_SETTING=r
 
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"
@@ -140,12 +152,9 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+# Waves
+export OUT_BEG=$RUN_BEG
+export RST_BEG=$RUN_BEG
+export RST_2_BEG=$RUN_BEG
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
index ed152ee35e..e112aa10cc 100644
--- a/tests/tests/cpld_restart_c192_p8
+++ b/tests/tests/cpld_restart_c192_p8
@@ -1,23 +1,23 @@
 #
-#  cpld_restart_c192_p8_aero test
+#  cpld_restart_c192_p8 test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C192 MX050 - 24h P8 restart test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
 
 export CNTL_DIR="cpld_control_c192_p8"
 
-export LIST_FILES="sfcf036.tile1.nc \
-                   sfcf036.tile2.nc \
-                   sfcf036.tile3.nc \
-                   sfcf036.tile4.nc \
-                   sfcf036.tile5.nc \
-                   sfcf036.tile6.nc \
-                   atmf036.tile1.nc \
-                   atmf036.tile2.nc \
-                   atmf036.tile3.nc \
-                   atmf036.tile4.nc \
-                   atmf036.tile5.nc \
-                   atmf036.tile6.nc \
-                   gocart.inst_aod.20210323_1800z.nc4 \
+export LIST_FILES="sfcf030.tile1.nc \
+                   sfcf030.tile2.nc \
+                   sfcf030.tile3.nc \
+                   sfcf030.tile4.nc \
+                   sfcf030.tile5.nc \
+                   sfcf030.tile6.nc \
+                   atmf030.tile1.nc \
+                   atmf030.tile2.nc \
+                   atmf030.tile3.nc \
+                   atmf030.tile4.nc \
+                   atmf030.tile5.nc \
+                   atmf030.tile6.nc \
+                   gocart.inst_aod.20210323_1200z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -51,20 +51,25 @@ export LIST_FILES="sfcf036.tile1.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
-                   RESTART/iced.2021-03-23-64800.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc"
+                   RESTART/iced.2021-03-23-43200.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc \
+                   20210323.120000.out_grd.ww3 \
+                   20210323.120000.out_pnt.ww3 "
 
 export_fv3
 export_cpl
 
-export DAYS=1.5
-export FHMAX=36
-export FHROT=12
+export DAYS=1.25
+export FHMAX=30
+export FHROT=15
 export RESTART_N=$((FHMAX-$FHROT))
+export OUTPUT_FH="15 30"
+export FHZERO=3
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export DOMAINS_STACK_SIZE=16000000
 
@@ -76,6 +81,7 @@ export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
 OCN_tasks=$OCN_tasks_cpl_c192
 ICE_tasks=$ICE_tasks_cpl_c192
+WAV_tasks=$WAV_tasks_cpl_c192
 
 # atm/ocn/ice resolution
 export ATMRES=C192
@@ -144,12 +150,9 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#Waves
+export OUT_BEG=$RUN_BEG
+export RST_BEG=$RUN_BEG
+export RST_2_BEG=$RUN_BEG
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_p8
similarity index 80%
rename from tests/tests/cpld_restart_c96_p8
rename to tests/tests/cpld_restart_p8
index c3129a9608..ae67486ac7 100644
--- a/tests/tests/cpld_restart_c96_p8
+++ b/tests/tests/cpld_restart_p8
@@ -1,10 +1,10 @@
 #
-#  cpld_restart_c96_p8_aero test
+#  cpld_restart P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS system - C96MX100 - P8 restart"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
-export CNTL_DIR="cpld_control_c96_p8"
+export CNTL_DIR="cpld_control_p8"
 
 export LIST_FILES="sfcf024.tile1.nc \
                    sfcf024.tile2.nc \
@@ -53,7 +53,9 @@ export LIST_FILES="sfcf024.tile1.nc \
                    RESTART/sfc_data.tile6.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2021-03-23-21600.nc \
-                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -63,7 +65,8 @@ export RESTART_N=$((FHMAX-$FHROT))
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 # ATM warm start
 export WARM_START=.true.
@@ -82,29 +85,13 @@ export USE_RESTART_TIME=.true.
 # MOM6 warm start
 export MOM6_RESTART_SETTING=r
 
-export TASKS=$TASKS_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
+# Waves
+export OUT_BEG=$RUN_BEG
+export RST_BEG=$RUN_BEG
+export RST_2_BEG=$RUN_BEG
 
-OCN_tasks=$OCN_tasks_cpl_c96
-ICE_tasks=$ICE_tasks_cpl_c96
-
-export NPROC_ICE=$ICE_tasks
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
-
-export CPLWAV=.false.
-export CPLWAV2ATM=.false.
-export MOM6_USE_WAVES=False
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
-
-export CPLCHM=.true.
-export NEMS_CONFIGURE=nems.configure.cpld_aero.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
index d4b5ad8c2c..dc75d2d906 100644
--- a/tests/tests/hafs_regional_atm_ocn_wav
+++ b/tests/tests/hafs_regional_atm_ocn_wav
@@ -13,7 +13,9 @@ export LIST_FILES="atmf006.nc \
                    archv.2019_241_06.a \
                    archs.2019_241_06.a \
                    out_grd.ww3 \
-                   out_pnt.ww3"
+                   out_pnt.ww3 \
+                   20190829.060000.restart.ww3 \
+                   ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3
 export_hafs
@@ -88,8 +90,8 @@ export CPLWAV=.true.
 export CPLWAV2ATM=.false.
 export CPL_IMP_MRG=.true.
 
-export FLD_DT="10800"
-export PNT_DT="10800"
+export DTFLD="10800"
+export DTPNT="10800"
 export GOFILETYPE=""
 export POFILETYPE=""
 export UNIPOINTS='ww3'
diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
index 1411cf0879..b16e4752d5 100644
--- a/tests/tests/hafs_regional_atm_wav
+++ b/tests/tests/hafs_regional_atm_wav
@@ -11,7 +11,9 @@ export CNTL_DIR=hafs_regional_atm_wav
 export LIST_FILES="atmf006.nc \
                    sfcf006.nc \
                    out_grd.ww3 \
-                   out_pnt.ww3"
+                   out_pnt.ww3 \
+                   20190829.060000.restart.ww3 \
+                   ufs.hafs.cpl.r.2019-08-29-21600.nc"
 
 export_fv3
 export_hafs
@@ -86,8 +88,8 @@ export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export CPL_IMP_MRG=.true.
 
-export FLD_DT="10800"
-export PNT_DT="10800"
+export DTFLD="10800"
+export DTPNT="10800"
 export GOFILETYPE=""
 export POFILETYPE=""
 export OUTPARS_WAV="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
index fba2250835..c0357261b1 100644
--- a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
+++ b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
@@ -115,8 +115,8 @@ export CPLWAV=.true.
 export CPLWAV2ATM=.false.
 export CPL_IMP_MRG=.true.
 
-export FLD_DT="10800"
-export PNT_DT="10800"
+export DTFLD="10800"
+export DTPNT="10800"
 export GOFILETYPE=""
 export POFILETYPE=""
 export UNIPOINTS='ww3'
@@ -125,7 +125,7 @@ export WW3GRIDLINE="'ww3' 'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'
 export WW3RSTDTHR=${FHMAX}
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-export RUN_END="20200825 120000"
+export RUN_END="20200825 180000"
 export OUT_BEG=$RUN_BEG
 export OUT_END=$RUN_END
 export RST_BEG=$RUN_BEG