From d0c08f66a5cb8963a145045ec0b614f22e26d38b Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Tue, 19 Jan 2021 19:31:49 +0000
Subject: [PATCH 1/9] add cpld_control)wave with 1deg wave grid

---
 tests/fv3_conf/cpld_control_run.IN | 10 ++++
 tests/tests/cpld_control_wave      | 93 ++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 tests/tests/cpld_control_wave

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index 08747fcae5..3dd2fbdae4 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -50,6 +50,16 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
 cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
 cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 
+# WW3 fix/input
+if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
+  cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
+  if [[ $RT1DEG == .T. ]]; then
+   cp    @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp
+  else
+   cp    @[INPUTDATA_ROOT_WW3]/ww3_multi.inp .
+  fi
+fi
+
 # No restart
 if [ $WARM_START = .F. ]; then
   # ICs
diff --git a/tests/tests/cpld_control_wave b/tests/tests/cpld_control_wave
new file mode 100644
index 0000000000..6de295f93e
--- /dev/null
+++ b/tests/tests/cpld_control_wave
@@ -0,0 +1,93 @@
+#
+#  cpld_control_wave test
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 with waves"
+
+export CNTL_DIR="cpld_control_wave"
+
+export LIST_FILES="phyf024.tile1.nc \
+                   phyf024.tile2.nc \
+                   phyf024.tile3.nc \
+                   phyf024.tile4.nc \
+                   phyf024.tile5.nc \
+                   phyf024.tile6.nc \
+                   dynf024.tile1.nc \
+                   dynf024.tile2.nc \
+                   dynf024.tile3.nc \
+                   dynf024.tile4.nc \
+                   dynf024.tile5.nc \
+                   dynf024.tile6.nc \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/MOM.res.nc \
+                   RESTART/iced.2016-10-04-00000.nc \
+                   RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc \
+                   out_grd.glo_1deg"
+
+export_fv3
+export_cpl
+
+# set component and coupling timesteps
+export DT_ATMOS='450'
+export DT_CICE=${DT_ATMOS}
+export DT_DYNAM_MOM6='900'
+export DT_THERM_MOM6='1800'
+export CPL_SLOW=${DT_THERM_MOM6}
+export CPL_FAST=${DT_ATMOS}
+
+export RESTART_INTERVAL="12"
+export RESTART_N=${RESTART_INTERVAL}
+
+export TASKS=$TASKS_cpl_wwav
+export TPN=$TPN_cpl_wwav
+export INPES=$INPES_cpl_wwav
+export JNPES=$JNPES_cpl_wwav
+export THRD=$THRD_cpl_wwav
+export WRTTASK_PER_GROUP=$WPG_cpl_wwav
+
+export med_petlist_bounds=$MPB_cpl_wwav
+export atm_petlist_bounds=$APB_cpl_wwav
+export ocn_petlist_bounds=$OPB_cpl_wwav
+export ice_petlist_bounds=$IPB_cpl_wwav
+export wav_petlist_bounds=$WPB_cpl_wwav
+
+# nems.configure
+export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
+export coupling_interval_slow_sec=${CPL_SLOW}
+export coupling_interval_fast_sec=${CPL_FAST}
+
+export CPLWAV='.T.'
+export CPLWAV2ATM='.T.'
+export RT1DEG='.T.'
+export FV3_RUN=cpld_control_run.IN

From dec774a84273e4560da3003e7a7c8adad57e1bbd Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Tue, 19 Jan 2021 20:36:05 +0000
Subject: [PATCH 2/9] modify setting

---
 tests/default_vars.sh              | 23 ++++++++++++++++++++++-
 tests/fv3_conf/cpld_control_run.IN |  6 +-----
 tests/tests/cpld_control_wave      | 23 +++++++++++------------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 7490a2c292..0c145649fa 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -22,9 +22,13 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   TASKS_strnest=96 ; TPN_strnest=28 ; INPES_strnest=2 ; JNPES_strnest=4
 
   TASKS_cpl_dflt=192; TPN_cpl_dflt=28; 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"
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  ePB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -64,6 +68,10 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -103,6 +111,10 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -167,6 +179,10 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -205,6 +221,10 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
+  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
@@ -555,6 +575,7 @@ export JATM=768
 export ATMRES='C96'
 export OCNRES='100'
 export ICERES='1.00'
+export WAVRES='1.00'
 export NX_GLB=360
 export NY_GLB=320
 
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index 3dd2fbdae4..2144040b27 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -53,11 +53,7 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 # WW3 fix/input
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
-  if [[ $RT1DEG == .T. ]]; then
-   cp    @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp
-  else
-   cp    @[INPUTDATA_ROOT_WW3]/ww3_multi.inp .
-  fi
+  cp    @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp
 fi
 
 # No restart
diff --git a/tests/tests/cpld_control_wave b/tests/tests/cpld_control_wave
index 6de295f93e..81dbc1d202 100644
--- a/tests/tests/cpld_control_wave
+++ b/tests/tests/cpld_control_wave
@@ -69,18 +69,18 @@ export CPL_FAST=${DT_ATMOS}
 export RESTART_INTERVAL="12"
 export RESTART_N=${RESTART_INTERVAL}
 
-export TASKS=$TASKS_cpl_wwav
-export TPN=$TPN_cpl_wwav
-export INPES=$INPES_cpl_wwav
-export JNPES=$JNPES_cpl_wwav
-export THRD=$THRD_cpl_wwav
-export WRTTASK_PER_GROUP=$WPG_cpl_wwav
+export TASKS=$TASKS_cpl_dflt_wwav
+export TPN=$TPN_cpl_dflt_wwav
+export INPES=$INPES_cpl_dflt_wwav
+export JNPES=$JNPES_cpl_dflt_wwav
+export THRD=$THRD_cpl_dflt_wwav
+export WRTTASK_PER_GROUP=$WPG_cpl_dflt_wwav
 
-export med_petlist_bounds=$MPB_cpl_wwav
-export atm_petlist_bounds=$APB_cpl_wwav
-export ocn_petlist_bounds=$OPB_cpl_wwav
-export ice_petlist_bounds=$IPB_cpl_wwav
-export wav_petlist_bounds=$WPB_cpl_wwav
+export med_petlist_bounds=$MPB_cpl_dflt_wwav
+export atm_petlist_bounds=$APB_cpl_dflt_wwav
+export ocn_petlist_bounds=$OPB_cpl_dflt_wwav
+export ice_petlist_bounds=$IPB_cpl_dflt_wwav
+export wav_petlist_bounds=$WPB_cpl_dflt_wwav
 
 # nems.configure
 export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
@@ -89,5 +89,4 @@ export coupling_interval_fast_sec=${CPL_FAST}
 
 export CPLWAV='.T.'
 export CPLWAV2ATM='.T.'
-export RT1DEG='.T.'
 export FV3_RUN=cpld_control_run.IN

From 657b9413fea5cc1262790feda0d9877365832088 Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Tue, 19 Jan 2021 20:53:21 +0000
Subject: [PATCH 3/9] fix typo in tests/default_vars.sh

---
 tests/default_vars.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 0c145649fa..5f029c148f 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -22,11 +22,11 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   TASKS_strnest=96 ; TPN_strnest=28 ; INPES_strnest=2 ; JNPES_strnest=4
 
   TASKS_cpl_dflt=192; TPN_cpl_dflt=28; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
-  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  ePB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -69,7 +69,7 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -112,7 +112,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -180,7 +180,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -222,7 +222,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  ePB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4

From 7f29488dce6bdeffcd0a37a73d4f88ba42daa869 Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Tue, 19 Jan 2021 20:59:43 +0000
Subject: [PATCH 4/9] add WPB

---
 tests/default_vars.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 5f029c148f..24ec404c8a 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -25,9 +25,9 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -68,9 +68,9 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -111,9 +111,9 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -179,9 +179,9 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -221,9 +221,9 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=288; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"
+  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"

From a56e892458414465dc57140602c714b900928f44 Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Tue, 19 Jan 2021 21:05:49 +0000
Subject: [PATCH 5/9] edit typo

---
 tests/default_vars.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 24ec404c8a..79fc745cb4 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -26,7 +26,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -69,7 +69,7 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -112,7 +112,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -180,7 +180,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
@@ -222,7 +222,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
   TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
   OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4

From acb5573c5f569fa19ee8d4a9404f330099058792 Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Wed, 20 Jan 2021 15:45:49 +0000
Subject: [PATCH 6/9] skip-ci

---
 tests/tests/cpld_control_wave | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tests/tests/cpld_control_wave b/tests/tests/cpld_control_wave
index 81dbc1d202..a317079296 100644
--- a/tests/tests/cpld_control_wave
+++ b/tests/tests/cpld_control_wave
@@ -58,17 +58,6 @@ export LIST_FILES="phyf024.tile1.nc \
 export_fv3
 export_cpl
 
-# set component and coupling timesteps
-export DT_ATMOS='450'
-export DT_CICE=${DT_ATMOS}
-export DT_DYNAM_MOM6='900'
-export DT_THERM_MOM6='1800'
-export CPL_SLOW=${DT_THERM_MOM6}
-export CPL_FAST=${DT_ATMOS}
-
-export RESTART_INTERVAL="12"
-export RESTART_N=${RESTART_INTERVAL}
-
 export TASKS=$TASKS_cpl_dflt_wwav
 export TPN=$TPN_cpl_dflt_wwav
 export INPES=$INPES_cpl_dflt_wwav
@@ -84,8 +73,6 @@ export wav_petlist_bounds=$WPB_cpl_dflt_wwav
 
 # nems.configure
 export NEMS_CONFIGURE="nems.configure.cpld_wave.IN"
-export coupling_interval_slow_sec=${CPL_SLOW}
-export coupling_interval_fast_sec=${CPL_FAST}
 
 export CPLWAV='.T.'
 export CPLWAV2ATM='.T.'

From 8b106a0e036af057b9e205dd0e381bd8da5adb67 Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Wed, 20 Jan 2021 19:22:59 +0000
Subject: [PATCH 7/9] finalize PE allocation skip-ci

---
 tests/default_vars.sh         | 30 +++++++++++++++---------------
 tests/rt.conf                 |  3 ++-
 tests/tests/cpld_control_wave |  4 +++-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 79fc745cb4..ee482d7050 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -25,9 +25,9 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -68,9 +68,9 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -111,9 +111,9 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -179,9 +179,9 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
@@ -221,9 +221,9 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=408; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=4; JNPES_cpl_dflt_wwav=8
-  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=12;  MPB_cpl_dflt_wwav="0 191"; APB_cpl_dflt_wwav="0 203"
-  OPB_cpl_dflt_wwav="204 263"; IPB_cpl_dflt_wwav="264 287"; WPB_cpl_dflt_wwav="288 407"
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
+  OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
   TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
diff --git a/tests/rt.conf b/tests/rt.conf
index e13e0072f8..0342175661 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -128,8 +128,9 @@ RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y           | - wcoss_cray gaea.intel jet.intel       | fv3 |
+COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y WW3=Y     | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_control                                                                                                            | - wcoss_cray gaea.intel jet.intel       | fv3 |
+RUN     | cpld_control_wave                                                                                                       | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray gaea.intel jet.intel       |     | cpld_control
 RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray gaea.intel jet.intel       |     | cpld_controlfrac
diff --git a/tests/tests/cpld_control_wave b/tests/tests/cpld_control_wave
index a317079296..6f1c9e43d7 100644
--- a/tests/tests/cpld_control_wave
+++ b/tests/tests/cpld_control_wave
@@ -53,7 +53,9 @@ export LIST_FILES="phyf024.tile1.nc \
                    RESTART/MOM.res.nc \
                    RESTART/iced.2016-10-04-00000.nc \
                    RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc \
-                   out_grd.glo_1deg"
+                   20161004.000000.out_grd.glo_1deg \
+                   20161004.000000.out_pnt.points \
+                   20161004.000000.restart.glo_1deg"
 
 export_fv3
 export_cpl

From 0cfb00ac8135842a0acd59e1f097f270deca54db Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Thu, 21 Jan 2021 16:50:35 +0000
Subject: [PATCH 8/9] some fixes skip-ci

---
 tests/fv3_conf/cpld_control_run.IN | 2 +-
 tests/rt.conf                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
index 2144040b27..296117e5ee 100644
--- a/tests/fv3_conf/cpld_control_run.IN
+++ b/tests/fv3_conf/cpld_control_run.IN
@@ -51,7 +51,7 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
 cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 
 # WW3 fix/input
-if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
+if [[ $CPLWAV == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   cp    @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp
 fi
diff --git a/tests/rt.conf b/tests/rt.conf
index 0342175661..aa368d7f5d 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -128,9 +128,8 @@ RUN     | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
 # CPLD tests                                                                                                                                                                      #
 ###################################################################################################################################################################################
 
-COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y WW3=Y     | - wcoss_cray gaea.intel jet.intel       | fv3 |
+COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y           | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_control                                                                                                            | - wcoss_cray gaea.intel jet.intel       | fv3 |
-RUN     | cpld_control_wave                                                                                                       | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restart                                                                                                            | - wcoss_cray gaea.intel jet.intel       |     | cpld_control
 RUN     | cpld_controlfrac                                                                                                        | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_restartfrac                                                                                                        | - wcoss_cray gaea.intel jet.intel       |     | cpld_controlfrac
@@ -164,6 +163,7 @@ COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p
 RUN     | cpld_bmark_wave                                                                                                         | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_bmarkfrac_wave                                                                                                     | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_bmarkfrac_wave_v16                                                                                                 | - wcoss_cray gaea.intel jet.intel       | fv3 |
+RUN     | cpld_control_wave                                                                                                       | - wcoss_cray gaea.intel jet.intel       | fv3 |
 
 COMPILE | DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y   | - wcoss_cray gaea.intel jet.intel       | fv3 |
 RUN     | cpld_debug                                                                                                              | - wcoss_cray gaea.intel jet.intel       | fv3 |

From 39636ca6986b238e9d1bdce92c7d9ae22bbb20dc Mon Sep 17 00:00:00 2001
From: Ali <ali.abdolali@noaa.gov>
Date: Thu, 21 Jan 2021 18:14:46 +0000
Subject: [PATCH 9/9] edit TPN for different machines skip-ci

---
 tests/default_vars.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index ee482d7050..e22afed9db 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -25,7 +25,7 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=28; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
   OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
@@ -179,7 +179,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=36; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
   OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
@@ -221,7 +221,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
   OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191"
 
-  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
+  TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=48; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
   OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"