diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index e79be0fa7a..a0974f73cb 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -321,6 +321,7 @@ fi
 WLCLK_dflt=30
 
 export WLCLK=$WLCLK_dflt
+export CMP_DATAONLY=false
 
 export_fv3 ()
 {
diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
index a26cac1136..7fcaf25d3d 100644
--- a/tests/fv3_conf/control_run.IN
+++ b/tests/fv3_conf/control_run.IN
@@ -24,6 +24,18 @@ else
     SUFFIX=${BL_SUFFIX}
   fi
 
+  # WAVE restart file for ATMW ORT tests
+  if [[ $CPLWAV == .true. ]]; then
+    if [[ $med_model == cmeps ]] && [[ $RUNTYPE == continue ]]; then
+      # CMEPS restart and pointer files
+      RFILE=ufs.atmw.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
+      cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
+      ls -1 ${RFILE}>rpointer.cpl
+    fi
+    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+    cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
+  fi
+
   if [ $MODEL_INITIALIZATION = false ]; then
     #read_inc and iau tests restart from fh=24
     CURRDIR=`pwd`
diff --git a/tests/logs/OpnReqTests_atmwav_control_noaero_p8_hera.log b/tests/logs/OpnReqTests_atmwav_control_noaero_p8_hera.log
new file mode 100644
index 0000000000..cd1232e3d9
--- /dev/null
+++ b/tests/logs/OpnReqTests_atmwav_control_noaero_p8_hera.log
@@ -0,0 +1,412 @@
+Tue Jun 13 16:03:47 UTC 2023
+Start Operation Requirement Test
+
+Compile bit elapsed time 607 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile dbg elapsed time 182 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile std elapsed time 569 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_bit_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_bit_base
+Checking test bit_base atmwav_control_noaero_p8_intel results ....
+Moving baseline bit_base atmwav_control_noaero_p8_intel files ....
+ Moving sfcf000.nc .........OK
+ Moving sfcf012.nc .........OK
+ Moving atmf000.nc .........OK
+ Moving atmf012.nc .........OK
+ Moving RESTART/20210322.180000.coupler.res .........OK
+ Moving RESTART/20210322.180000.fv_core.res.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Moving RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Moving 20210322.180000.out_pnt.ww3 .........OK
+ Moving 20210322.180000.out_grd.ww3 .........OK
+ Moving ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 110.329608
+  0: The maximum resident set size (KB)                   = 1685708
+
+Test bit_base atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_dbg_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_dbg_base
+Checking test dbg_base atmwav_control_noaero_p8_intel results ....
+Moving baseline dbg_base atmwav_control_noaero_p8_intel files ....
+ Moving sfcf000.nc .........OK
+ Moving sfcf012.nc .........OK
+ Moving atmf000.nc .........OK
+ Moving atmf012.nc .........OK
+ Moving RESTART/20210322.180000.coupler.res .........OK
+ Moving RESTART/20210322.180000.fv_core.res.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Moving RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Moving 20210322.180000.out_pnt.ww3 .........OK
+ Moving 20210322.180000.out_grd.ww3 .........OK
+ Moving ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 1070.722744
+  0: The maximum resident set size (KB)                   = 1641856
+
+Test dbg_base atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_dcp
+Checking test dcp atmwav_control_noaero_p8_intel results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf012.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf012.nc .........OK
+ Comparing RESTART/20210322.180000.coupler.res .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Comparing 20210322.180000.out_pnt.ww3 .........OK
+ Comparing 20210322.180000.out_grd.ww3 .........OK
+ Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 92.379993
+  0: The maximum resident set size (KB)                   = 1627576
+
+Test dcp atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_fhz
+Checking test fhz atmwav_control_noaero_p8_intel results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf012.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf012.nc .........OK
+ Comparing RESTART/20210322.180000.coupler.res .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Comparing 20210322.180000.out_pnt.ww3 .........OK
+ Comparing 20210322.180000.out_grd.ww3 .........OK
+ Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 92.554289
+  0: The maximum resident set size (KB)                   = 1628276
+
+Test fhz atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_mpi
+Checking test mpi atmwav_control_noaero_p8_intel results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf012.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf012.nc .........OK
+ Comparing RESTART/20210322.180000.coupler.res .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Comparing 20210322.180000.out_pnt.ww3 .........OK
+ Comparing 20210322.180000.out_grd.ww3 .........OK
+ Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 93.209351
+  0: The maximum resident set size (KB)                   = 1623516
+
+Test mpi atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_rst
+Checking test rst atmwav_control_noaero_p8_intel results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf012.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf012.nc .........OK
+ Comparing RESTART/20210322.180000.coupler.res .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Comparing 20210322.180000.out_pnt.ww3 .........OK
+ Comparing 20210322.180000.out_grd.ww3 .........OK
+ Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 93.152619
+  0: The maximum resident set size (KB)                   = 1633108
+
+Test rst atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_std_base
+Checking test std_base atmwav_control_noaero_p8_intel results ....
+Moving baseline std_base atmwav_control_noaero_p8_intel files ....
+ Moving sfcf000.nc .........OK
+ Moving sfcf012.nc .........OK
+ Moving atmf000.nc .........OK
+ Moving atmf012.nc .........OK
+ Moving RESTART/20210322.180000.coupler.res .........OK
+ Moving RESTART/20210322.180000.fv_core.res.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Moving RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Moving RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Moving RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Moving 20210322.180000.out_pnt.ww3 .........OK
+ Moving 20210322.180000.out_grd.ww3 .........OK
+ Moving ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 92.974724
+  0: The maximum resident set size (KB)                   = 1613148
+
+Test std_base atmwav_control_noaero_p8_intel PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Sadegh.Tabas/FV3_OPNREQ_TEST/OPNREQ_TEST/atmwav_control_noaero_p8_std_base_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Sadegh.Tabas/FV3_OPNREQ_TEST/opnReqTest_28698/atmwav_control_noaero_p8_intel_thr
+Checking test thr atmwav_control_noaero_p8_intel results ....
+ Comparing sfcf000.nc .........OK
+ Comparing sfcf012.nc .........OK
+ Comparing atmf000.nc .........OK
+ Comparing atmf012.nc .........OK
+ Comparing RESTART/20210322.180000.coupler.res .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_core.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.phy_data.tile6.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile1.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile2.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile3.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile4.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
+ Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
+ Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .........OK
+ Comparing 20210322.180000.out_pnt.ww3 .........OK
+ Comparing 20210322.180000.out_grd.ww3 .........OK
+ Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
+
+  0: The total amount of wall time                        = 91.549472
+  0: The maximum resident set size (KB)                   = 1633532
+
+Test thr atmwav_control_noaero_p8_intel PASS
+
+OPERATION REQUIREMENT TEST WAS SUCCESSFUL
+Tue Jun 13 16:31:05 UTC 2023
+Elapsed time: 00h:27m:19s. Have a nice day!
diff --git a/tests/opnReqTest b/tests/opnReqTest
index f25f8805da..f1f77ca31c 100755
--- a/tests/opnReqTest
+++ b/tests/opnReqTest
@@ -153,6 +153,8 @@ run_opnReqTests() {
       application=cpld
     elif [[ $TEST_NAME =~ datm ]]; then
       application=datm
+    elif [[ $TEST_NAME =~ atmw ]]; then
+      application=atmw
     else
       application=global
     fi
diff --git a/tests/opnReqTests/dbg.sh b/tests/opnReqTests/dbg.sh
index 33194584c2..96d26889a1 100644
--- a/tests/opnReqTests/dbg.sh
+++ b/tests/opnReqTests/dbg.sh
@@ -36,10 +36,28 @@ elif [[ $application == 'cpld' ]]; then
                                    | 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/ *$//")
+elif [[ $application == 'atmw' ]]; then
+  FHMAX=3
+  WW3RSTDTHR=3
+  DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+  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/sfcf012/sfcf003/g" \
+                                   | sed -E "s/atmf012/atmf003/g" \
+                                   | sed -E "s/2021-03-22-64800/2021-03-22-32400/g" \
+                                   | sed -E "s/20210322\.180000/20210322\.090000/g" \
+                                   | sed -E "s/20210322\.180000\.out_pnt\.ww3/20210322\.090000\.out_pnt\.ww3/g" \
+                                   | sed -E "s/20210322\.180000\.out_grd\.ww3/20210322\.090000\.out_grd\.ww3/g" \
+                                   | sed -e "s/^ *//" -e "s/ *$//")
+                                   
 fi
 
 source $PATHRT/opnReqTests/wrt_env.sh
 
 cat <<EOF >>${RUNDIR_ROOT}/opnreq_test${RT_SUFFIX}.env
 export WLCLK=${WLCLK}
+export DT_2_RST=${DT_2_RST:-}
 EOF
diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh
index 46069d7d7e..8c7c18fa67 100644
--- a/tests/opnReqTests/dcp.sh
+++ b/tests/opnReqTests/dcp.sh
@@ -37,6 +37,16 @@ elif [[ $application == 'cpld' ]]; then
     INPES=$JNPES
     JNPES=$temp
   fi
+elif [[ $application == 'atmw' ]]; then
+  if [[ $CI_TEST == 'true' ]]; then
+    INPES=3
+    JNPES=1
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+  else
+    temp=$INPES
+    INPES=$JNPES
+    JNPES=$temp
+  fi
 fi
 
 
diff --git a/tests/opnReqTests/fhz.sh b/tests/opnReqTests/fhz.sh
index 80126273cc..ec4e0e6df4 100644
--- a/tests/opnReqTests/fhz.sh
+++ b/tests/opnReqTests/fhz.sh
@@ -1,6 +1,7 @@
 set -eu
 source $PATHRT/opnReqTests/std.sh
 
+
 if [[ $application == 'global' ]]; then
   FHZERO=3
   LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/phyf024.nc ?//g" \
@@ -20,6 +21,11 @@ elif [[ $application == 'cpld' ]]; then
     echo "This test is not yet set up for the fhzero test, skipping..."
     continue 1
   fi
+elif [[ $application == 'atmw' ]]; then
+  FHZERO=3
+  LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf012.nc ?//g" \
+                                   | sed -E "s/atmf012.nc ?//g" \
+                                   | sed -e "s/^ *//" -e "s/ *$//")
 else
   echo "This test is not yet set up for the fhzero test, skipping..."
   continue 1
@@ -29,4 +35,5 @@ source $PATHRT/opnReqTests/wrt_env.sh
 
 cat <<EOF >>${RUNDIR_ROOT}/opnreq_test${RT_SUFFIX}.env
 export FHZERO=${FHZERO}
+export CMP_DATAONLY=true
 EOF
diff --git a/tests/opnReqTests/mpi.sh b/tests/opnReqTests/mpi.sh
index 340cbc5a13..b16b4af135 100644
--- a/tests/opnReqTests/mpi.sh
+++ b/tests/opnReqTests/mpi.sh
@@ -18,6 +18,17 @@ elif [[ $application == 'regional' ]]; then
 elif [[ $application == 'cpld' ]]; then
   echo "Coupled application not yet implemented for mpi, skipping..."
   continue 1
+elif [[ $application == 'atmw' ]]; then
+  if [ $CI_TEST == 'true' ]; then
+    INPES=2
+    JNPES=2
+  else
+    JNPES=$((JNPES/2))
+  fi
+  WRITE_GROUP=2
+  WRTTASK_PER_GROUP=12
+  TASKS=$(( INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP ))
+  NODES=$(((TASKS+TPN-1)/TPN))
 fi
 
 
diff --git a/tests/opnReqTests/rst.sh b/tests/opnReqTests/rst.sh
index 3446b5c199..1a070d866f 100644
--- a/tests/opnReqTests/rst.sh
+++ b/tests/opnReqTests/rst.sh
@@ -33,6 +33,16 @@ elif [[ $application == 'cpld' ]]; then
   RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
   RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (SHOUR + FHROT)* 3600 )))"
   RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR} )))0000"
+elif [[ $application == 'atmw' ]]; then
+  FHROT=$(( FHMAX/2 ))
+  WW3RSTDTHR=6
+  DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+  RUNTYPE='continue'
+  USE_RESTART_TIME='.true.'
+  RESTART_N=$(( FHMAX - FHROT ))
+  RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
+  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.
@@ -59,6 +69,7 @@ source $PATHRT/opnReqTests/wrt_env.sh
 
 cat <<EOF >>${RUNDIR_ROOT}/opnreq_test${RT_SUFFIX}.env
 export FHROT=${FHROT}
+export DT_2_RST=${DT_2_RST:-}
 export RESTART_FILE_PREFIX=${RESTART_FILE_PREFIX}
 export NSTF_NAME=${NSTF_NAME}
 export CICERUNTYPE=${CICERUNTYPE:-}
diff --git a/tests/opnReqTests/std.sh b/tests/opnReqTests/std.sh
index f6d5819397..c4b034150a 100644
--- a/tests/opnReqTests/std.sh
+++ b/tests/opnReqTests/std.sh
@@ -32,6 +32,16 @@ elif [[ $application == 'cpld' ]]; then
   fi
   RESTART_N=$(( FHMAX/2 ))
   RESTART_INTERVAL="${RESTART_N} -1"
+elif [[ $application == 'atmw' ]]; then
+  if [ $CI_TEST == 'true' ]; then
+    INPES=3
+    JNPES=8
+    WRTTASK_PER_GROUP=6
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+    NODES=$(((TASKS+TPN-1)/TPN))
+  fi
+  RESTART_N=$(( FHMAX/2 ))
+  RESTART_INTERVAL="${RESTART_N} -1"
 fi
 
 #outdated (test $CI_TEST == 'true') && source $PATHRT/opnReqTests/cmp_proc_bind.sh
diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh
index ea776b7c65..8a7f5838b6 100644
--- a/tests/opnReqTests/thr.sh
+++ b/tests/opnReqTests/thr.sh
@@ -51,6 +51,14 @@ elif [[ $application == 'cpld' ]]; then
       continue 1
     fi
   fi
+elif [[ $application == 'atmw' ]]; then
+  if [[ $CI_TEST == 'true' ]]; then
+    INPES=5
+    JNPES=11
+    WRTTASK_PER_GROUP=10
+    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+    NODES=$(((TASKS+TPN-1)/TPN))
+  fi
 fi
 
 
diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
index 72ed349b46..28e9e71021 100755
--- a/tests/rt_utils.sh
+++ b/tests/rt_utils.sh
@@ -351,7 +351,11 @@ check_results() {
             printf ".......ALT CHECK.." >> ${RT_LOG}
             printf ".......ALT CHECK.."
             if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ cheyenne ]] ; then
-              nccmp -d -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+              if [[ $CMP_DATAONLY == false ]]; then
+                nccmp -d -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+              else
+                nccmp -d -f -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+              fi
               if [[ $d -ne 0 && $d -ne 1 ]]; then
 		  echo "....ERROR" >> ${RT_LOG}
 		  echo "....ERROR"