Squashed commit of the following:

commit b68ca32 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 15:09:15 2022 -0600 add tasking change for cheyenne commit 638880f Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 15:02:15 2022 -0600 cheyenne.intel bmark_p8 1315.299978s commit d565860 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 16 12:30:02 2022 -0600 cheyenne.intel bmark-p8 = 1567.611026s *cpld_control_c192 1342s commit b3930ed Author: Denise.Worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 21:37:24 2022 +0000 dell-p3 cpld_bmark_p8 wall time = 1180.752102 commit 9b7a8b2 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 16:26:50 2022 -0400 gaea bmark_p8 wall time = 1219.003796 commit 36d512c Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 18:31:52 2022 +0000 hera bmark_p8 test wall time = 1077.963755 commit cf8e0e2 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 17:45:06 2022 +0000 set testing values * let jet.intel run all tests * set tries to 1 commit ca61c7b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 13:42:08 2022 -0400 set resources for coupled tests * make all platforms use the same cpld resources * jet bmark_p8 uses special values; in testing the default values time out w/ about 30mins of forecast time remaining commit 78b9c28 Author: Denise.Worthen <Denise.Worthen@noaa.gov> Date: Thu May 12 15:49:56 2022 +0000 update default vars for dell *rt_007_cpld_control_c192_p8.log:[0] The total amount of wall time = 1068.155437 *rt_009_cpld_bmark_p8.log:[0] The total amount of wall time = 1185.657834 commit 1a67517 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed May 11 22:38:28 2022 +0000 fix default tasks commit 5936b5a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed May 11 15:22:50 2022 -0400 update cpl_c192 for waves commit 9d6cf0d Merge: d74b9b6 b751b8d Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed May 11 12:25:00 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit b751b8d Author: Grant Firl <grant.firl@noaa.gov> Date: Wed May 11 09:04:49 2022 -0400 NSSL ccpp-physics bugfixes and new ccpp-framework debugging feature (ufs-community#1202) commit d74b9b6 Merge: 4687e90 7a9a5f1 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue May 10 17:40:59 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 4687e90 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue May 10 17:05:20 2022 -0400 intermediate commit prior to merging task PR commit 7a9a5f1 Merge: 917f55d 38f4f6a Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue May 10 15:58:18 2022 -0400 Merge branch 'ufs-community:develop' into develop commit 38f4f6a Author: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com> Date: Tue May 10 15:55:57 2022 -0400 Compute petlist bounds for each subcomponent from number of tasks. Update CICE (ufs-community#1200) * Instead of specifying petlist bounds (lower and upper bound), compute them using the number of tasks for each component. The function that computes petlist bounds assumes that the mediator always runs on the same tasks as ATM component, and that the Chemistry component also always runs on the same tasks as ATM. * Update CICE submodule (@DeniseWorthen) Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com> commit 9d4245e Merge: 6ddbe69 0ee3448 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue May 10 08:22:48 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit 917f55d Merge: 29f451b 0ee3448 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon May 9 18:48:55 2022 -0400 Merge branch 'ufs-community:develop' into develop commit 6ddbe69 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 16:26:51 2022 -0600 modifcations and verify against baseline * using Jessica's mod_def inputs in WW3_input_data_20220418, all baselines pass except for multigrid * cheyenne.intel: control_c192 1250s, control_bmark_p8 1500s * remove cpl_c96 default vars; these are used in noaero test but are not needed commit 90cc6cf Merge: 02d8590 29f451b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 14:36:58 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 02d8590 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat May 7 14:33:36 2022 -0400 revert bmark p8 changes * need to remove bmark p8 from cheyenne.intel commit 29f451b Merge: 4f931a1 f09e45b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu May 5 08:23:50 2022 -0400 Merge branch 'ufs-community:develop' into develop commit b8e0d72 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 16:58:04 2022 +0000 update RUN_BEG placement so it catches the restart commit 5e7faae Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:35:52 2022 -0400 revert some changes * revert end-of-run restart variable * remove ice,cmeps restarts * make ww3 interval 1 hour commit 2a9dcad Merge: 474bcbb 26d410a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:20:48 2022 -0400 Merge branch 'feature/cmake_meshcapbuild' into feature/testrtchanges commit 474bcbb Merge: 06c66d3 5caf30e Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon May 2 10:16:49 2022 -0400 Merge branch 'develop' into feature/testrtchanges commit 06c66d3 Merge: c98ad6a 07edf4c Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon May 2 09:39:38 2022 -0400 Merge branch 'ufs-community:develop' into feature/testrtchanges commit c98ad6a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:53:39 2022 -0400 update for rt tests * reduce c192 to 30h * implement 3/1/1 restart test for bmark_p8 commit 6aa5b9b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:27:44 2022 -0400 reduce c192 test to 30hrs commit 32873d3 Merge: 185baae 8c2d904 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sun May 1 10:15:21 2022 -0400 Merge branch 'feature/cmake_meshcapbuild' into feature/testrtchanges commit 185baae Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 15:36:51 2022 -0400 revert change in the AERO_HISTORY.rc commit 29f00df Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 15:31:25 2022 -0400 update c192 tasking in default vars commit 815b342 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 30 13:29:44 2022 -0600 add gocart inst_aod file for comparison at hour 9 commit 835908a Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 13:49:22 2022 -0400 add harness to control gocart history freq commit e37f090 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 30 09:29:58 2022 -0400 add todos for c192 tasking on other platforms commit 9acc6f6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 29 17:51:14 2022 -0400 update c192 resources for hera and orion commit f9e01d5 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 29 15:12:07 2022 -0600 update WW3 * all baselines pass using new state_getfldptr interface * bmark_p8 contrl 1478s commit ba78277 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Sat Mar 26 15:49:16 2022 -0600 all baselines pass w/ fix2d branch commit fa1adb1 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Fri Mar 25 13:40:22 2022 -0600 update rt.wave_aero commit a80e036 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 09:52:29 2022 -0400 remove unused tasking setups commit 3c5afe9 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 09:46:45 2022 -0400 remove unused or temporary files commit fea06b4 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Fri Mar 25 06:33:42 2022 -0600 all baselines pass on cheyenne.intel * gnu testing is incomplete * cpld_control_c192_p8: 1348s * cpld_bmark_p8: 1442s * cpld_debug_p8: 684s commit 07311e6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 06:44:58 2022 -0400 clean up comment in tests commit d189746 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Fri Mar 25 06:42:09 2022 -0400 add waves to c192 tasking commit 6de5193 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu Mar 24 04:39:12 2022 -0600 add back diag_table setting for noaero commit 598f0ef Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Thu Mar 24 04:13:38 2022 -0600 fix field table for gnu noaero test commit c9355ee Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:52:44 2022 -0400 rename gnu test and fix rt_gnu.conf commit f5d2c76 Merge: 1ee194b 0453056 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:42:57 2022 -0400 Merge branch 'feature/testrtchanges' of https://github.com/DeniseWorthen/ufs-weather-model into feature/testrtchanges commit 1ee194b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Thu Mar 24 04:42:01 2022 -0400 temp clean up tasking all platforms; gnu noaero commit 0453056 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 19:04:32 2022 -0600 cpld bmark p8 verifies w/ restart * control: 1564s, restart: 732s commit bca776b Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 16:04:03 2022 -0600 fix output hour for cpld_bmark_p8 wave files *cpld_bmark_p8 test : 1490s commit cc06f96 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 15:52:27 2022 -0400 fix cheyenne tasking (again) commit a35755f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 15:31:24 2022 -0400 fix tasks for bmark p8 test; add restart test commit 6ec17f5 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 14:16:11 2022 -0400 update bmark_p8 with changes from c384_p8 commit da58007 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 12:07:47 2022 -0600 multigrid and debug pass tested and passed commit 8f1e9aa Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 08:56:56 2022 -0600 remove file from comparison list for multigrid test * multigrid writes 'pnt' file as X.pnt.points which conflicts with shel writing it as X.pnt.ww3. Tried setting 'points' in multi.inp to empty string but model would not run; so remove this file from comparison commit 43dff6d Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 09:43:48 2022 -0400 update CNTL_LIST names and add test for multigrid commit 48df133 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 07:36:59 2022 -0600 all baselines pass commit baca83b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 08:31:19 2022 -0400 rename tests * create remaining control (c96) tests for decomp etc but compare against existing baseline name (control_c96). * update rt.wave_aero for new tests commit 4583940 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 06:08:08 2022 -0600 all baselines pass commit 7f9e8d0 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 06:33:33 2022 -0400 modify default nems.configure * retain only two nems.configure for cpld model, one with aero as the default and noaero for the gnu jobs * x out cpld p7 tests since they will be removed commit 75817c1 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Wed Mar 23 06:15:00 2022 -0400 removed commented out variables commit 3e6ad70 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Wed Mar 23 04:05:38 2022 -0600 all baselines pass commit 0d8247f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 15:45:00 2022 -0400 update default field_table commit ae77588 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 11:44:55 2022 -0400 update default vars * comment out settings in tests which are defaults commit f95a76a Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 22 08:40:35 2022 -0600 update baseline/verify; all tests pass * comparison of gocart file turned off in cpld debug until I can create one at fhmax=3 * all baselines pass--dt_inner fix resolved gocart restart file failure? * c192 control test: 1350s * c384 control test: 1440s * c96 debug (all components): 684s commit 034ba19 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 08:00:14 2022 -0400 update tests * make more corrections and consistency mods commit 924aa7f Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 07:09:56 2022 -0400 reduce fhmax for cpld debug to 3 hours commit 32a947e Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 06:47:48 2022 -0400 reorder runseq to match dev commit 89b8071 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Tue Mar 22 06:38:11 2022 -0400 fix tests and re-order *fix dt_inner for c192 * re-order items in tests to make comparison more direct commit 38abb07 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Tue Mar 22 03:31:40 2022 -0600 update to staged baseline, temp rt.wave_aero file * all tests run to completion * c96 control: 410s, restart: 225s * c192 control: 1140s, restart: 733s * c384 control: 1140s, restart: 640s * c96 debug: 1080s * restart tests provisionally pass with the following * c96: ww3 restart fails comparison * c192, c384: gocart file fails comparison commit 032352b Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 18:25:48 2022 -0400 update tasking on cheyenne, add p8 debug commit ca298e6 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 17:55:46 2022 -0400 try setting all 3 restart tests commit 7332dd2 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 17:03:37 2022 -0400 update c96 restart commit 4c33e79 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 14:59:27 2022 -0600 control_atmwav test reproduces baseline develop-20220318 commit 4ecebf7 Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 16:45:16 2022 -0400 update c96 restart version commit 5d5cc01 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 14:36:32 2022 -0600 add multigrid=true for use by atmw commit 49c5c67 Author: denise.worthen <Denise.Worthen@noaa.gov> Date: Mon Mar 21 13:31:28 2022 -0600 add fix for debug compile and change input data commit f67c01e Author: Denise Worthen <denise.worthen@noaa.gov> Date: Mon Mar 21 11:57:32 2022 -0400 update c96p8 test on cheyenne with gocart
DeniseWorthen · May 16, 2022 · 6d21e6d · 6d21e6d
1 parent 296796d
commit 6d21e6d
Show file tree

Hide file tree

Showing 77 changed files with 3,844 additions and 3,877 deletions.
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -47,7 +47,7 @@ BUILD_DIR=$(pwd)/build_${BUILD_NAME}
 if [[ $MACHINE_ID == cheyenne.* ]] ; then
     BUILD_JOBS=${BUILD_JOBS:-3}
 elif [[ $MACHINE_ID == wcoss_dell_p3 ]] ; then
-    BUILD_JOBS=${BUILD_JOBS:-4}
+    BUILD_JOBS=${BUILD_JOBS:-2}
     source $PATHTR/tests/module-setup.sh
 fi
 

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh
@@ -14,22 +14,22 @@ elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=10
     JNPES=3
-    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+    NTILES=1
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP))
     NODES=$(((TASKS+TPN-1)/TPN))
   else
     INPES=5
     JNPES=12
+    NTILES=1
   fi
 elif [[ $application == 'cpld' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=3
     JNPES=1
-    NPROC_ICE=6
-    med_petlist_bounds="0 17"
-    atm_petlist_bounds="0 23"
-    ocn_petlist_bounds="24 33"
-    ice_petlist_bounds="34 39"
-    TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 10 + 6))
+    OCN_tasks=10
+    ICE_tasks=6
+    NPROC_ICE=$ICE_tasks
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
   else
     temp=$INPES
     INPES=$JNPES

diff --git a/tests/opnReqTests/fhz.sh b/tests/opnReqTests/fhz.sh
@@ -11,7 +11,7 @@ if [[ $application == 'global' ]]; then
                                    | sed -E "s/GFSPRS.GrbF24 ?//g" \
                                    | sed -e "s/^ *//" -e "s/ *$//")
 elif [[ $application == 'cpld' ]]; then
-  if [[ $TEST_NAME == 'cpld_control_c96_p8' ]] || [[ $TEST_NAME == 'cpld_control_p8' ]]; then
+  if [[ $TEST_NAME =~ 'cpld_control_c96_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_c96_noaero_p8' ]]; then
     FHZERO=3
     LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024.tile[1-6].nc ?//g" \
                                      | sed -E "s/atmf024.tile[1-6].nc ?//g" \

diff --git a/tests/opnReqTests/mpi.sh b/tests/opnReqTests/mpi.sh
@@ -10,7 +10,7 @@ if [[ $application == 'global' ]]; then
   fi
   WRITE_GROUP=2
   WRTTASK_PER_GROUP=12
-  TASKS=$(( INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP ))
+  TASKS=$(( INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP ))
   NODES=$(((TASKS+TPN-1)/TPN))
 elif [[ $application == 'regional' ]]; then
   echo "Regional application not yet implemented for mpi"

diff --git a/tests/opnReqTests/std.sh b/tests/opnReqTests/std.sh
@@ -6,27 +6,26 @@ if [[ $application == 'global' ]]; then
     JNPES=2
     WRITE_GROUP=1
     WRTTASK_PER_GROUP=12
-    TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP))
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP))
   fi
   RESTART_N=$(( FHMAX/2 ))
   RESTART_INTERVAL="${RESTART_N} -1"
 elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=4
     JNPES=6
+    NTILES=1
     WRTTASK_PER_GROUP=8
-    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP))
   fi
 elif [[ $application == 'cpld' ]]; then
   if [ $CI_TEST == 'true' ]; then
     INPES=2
     JNPES=2
-    NPROC_ICE=6
-    med_petlist_bounds="0 23"
-    atm_petlist_bounds="0 29"
-    ocn_petlist_bounds="30 39"
-    ice_petlist_bounds="40 45"
-    TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 10 + 6))
+    OCN_tasks=10
+    ICE_tasks=6
+    NPROC_ICE=$ICE_tasks
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
   fi
   RESTART_N=$(( FHMAX/2 ))
   RESTART_INTERVAL="${RESTART_N} -1"

diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh
@@ -5,46 +5,42 @@ THRD=2
 TPN=$((TPN/THRD))
 if [[ $application == 'global' ]]; then
   JNPES=$((JNPES/THRD))
-  TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP))
+  TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP))
   NODES=$(((TASKS+TPN-1)/TPN))
 elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=4
     JNPES=4
-    TASKS=$((INPES*JNPES + WRITE_GROUP*WRTTASK_PER_GROUP))
+    NTILES=1
+    TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP))
   fi
   NODES=$(((TASKS+TPN-1)/TPN))
 elif [[ $application == 'cpld' ]]; then
   if [[ $CI_TEST != 'true' ]]; then
-    if [[ $TEST_NAME == 'cpld_control_c96_p8' ]]; then
+    if [[ $TEST_NAME =~ 'cpld_control_c96_p8' ]]; then
       INPES=3
       JNPES=4
-      med_petlist_bounds="0 71"
-      chm_petlist_bounds="0 71"
-      atm_petlist_bounds="0 77"
-      ocn_petlist_bounds="78 107"
-      ice_petlist_bounds="108 119"
-      TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 30 + 12))
+      OCN_tasks=30
+      ICE_tasks=12
+      NPROC_ICE=$ICE_tasks
+      TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
-    elif [[ $TEST_NAME == 'cpld_control_c96_noaero_p8' ]]; then
+    elif [[ $TEST_NAME =~ 'cpld_control_c96_noaero_p8' ]]; then
       INPES=3
       JNPES=4
-      med_petlist_bounds="0 71"
-      atm_petlist_bounds="0 77"
-      ocn_petlist_bounds="78 107"
-      ice_petlist_bounds="108 119"
-      TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 30 + 12))
+      OCN_tasks=30
+      ICE_tasks=12
+      NPROC_ICE=$ICE_tasks
+      TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
-    elif [[ $TEST_NAME == 'cpld_control_p8' ]]; then
+    elif [[ $TEST_NAME =~ 'cpld_control_p8' ]]; then
       INPES=3
       JNPES=4
-      med_petlist_bounds="0 71"
-      chm_petlist_bounds="0 71"
-      atm_petlist_bounds="0 77"
-      ocn_petlist_bounds="78 97"
-      ice_petlist_bounds="98 107"
-      wav_petlist_bounds="108 119"
-      TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 20 + 10 + 12))
+      OCN_tasks=20
+      ICE_tasks=10
+      WAV_tasks=12
+      NPROC_ICE=$ICE_tasks
+      TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks + WAV_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
     elif [[ $TEST_NAME == 'cpld_bmark_p8' ]]; then
       NODES=$(((TASKS+TPN-1)/TPN))

diff --git a/tests/opnReqTests/wrt_env.sh b/tests/opnReqTests/wrt_env.sh
@@ -8,15 +8,13 @@ export RESTART_N=${RESTART_N:-}
 export RESTART_INTERVAL="${RESTART_INTERVAL:-}"
 export INPES=${INPES}
 export JNPES=${JNPES}
+export NTILES=${NTILES:-}
+export OCN_tasks=${OCN_tasks:-}
+export ICE_tasks=${ICE_tasks:-}
+export WAV_tasks=${WAV_tasks:-}
 export WRITE_GROUP=${WRITE_GROUP}
 export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP}
 export NPROC_ICE=${NPROC_ICE:-}
-export med_petlist_bounds="${med_petlist_bounds:-}"
-export chm_petlist_bounds="${chm_petlist_bounds:-}"
-export atm_petlist_bounds="${atm_petlist_bounds:-}"
-export ocn_petlist_bounds="${ocn_petlist_bounds:-}"
-export ice_petlist_bounds="${ice_petlist_bounds:-}"
-export wav_petlist_bounds="${wav_petlist_bounds:-}"
 export THRD=${THRD}
 export TASKS=${TASKS}
 export TPN=${TPN}

diff --git 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=20220508
+BL_DATE=20220511
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
@@ -599,7 +599,7 @@ if [[ $ECFLOW == true ]]; then
   MAX_JOBS=30
 
   # Default number of tries to run jobs - on wcoss, no error tolerance
-  ECF_TRIES=2
+  ECF_TRIES=1
   if [[ $MACHINE_ID = wcoss* ]]; then
     ECF_TRIES=1
   fi
@@ -777,6 +777,7 @@ EOF
     (
       source ${PATHRT}/tests/$TEST_NAME
 
+      TPN=$(( TPN / THRD ))
       NODES=$(( TASKS / TPN ))
       if (( NODES * TPN < TASKS )); then
         NODES=$(( NODES + 1 ))

diff --git a/tests/rt.wave_aero b/tests/rt.wave_aero
@@ -0,0 +1,34 @@
+###################################################################################################################################################################################
+# S2S tests                                                                                                                                                                    #
+###################################################################################################################################################################################
+
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                        | - wcoss_cray                            | fv3 |
+RUN     | cpld_control_p8                                                                                                         | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_p8                                                                                                         | - wcoss_cray                            |     | cpld_control_p8
+RUN     | cpld_2threads_p8                                                                                                        | - wcoss_cray                            |     |
+RUN     | cpld_decomp_p8                                                                                                          | - wcoss_cray                            |     |
+RUN     | cpld_mpi_p8                                                                                                             | - wcoss_cray                            |     |
+RUN     | cpld_multigrid_p8                                                                                                       | - wcoss_cray                            |     |
+
+RUN     | cpld_control_c192_p8                                                                                                    | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss_cray                            |     | cpld_control_c192_p8
+
+RUN     | cpld_bmark_p8                                                                                                           | - wcoss_cray                            | fv3 |
+RUN     | cpld_restart_bmark_p8                                                                                                   | - wcoss_cray                            |     | cpld_bmark_p8
+
+COMPILE | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                             | - wcoss_cray                            | fv3 |
+RUN     | cpld_debug_p8                                                                                                           | - wcoss_cray                            | fv3 |
+###################################################################################################################################################################################
+# HAFS tests                                                                                                                                                                      #
+###################################################################################################################################################################################
+
+COMPILE | -DAPP=HAFSW -DCCPP_SUITES=FV3_HAFS_v0_gfdlmp_tedmf,FV3_HAFS_v0_gfdlmp_tedmf_nonsst,FV3_HAFS_v0_thompson_tedmf_gfdlsf -D32BIT=ON  | - wcoss2                       | fv3 |
+RUN     | hafs_regional_atm_wav                                                                                                   | - wcoss2                                | fv3 |
+RUN     | hafs_regional_atm_ocn_wav                                                                                               | - wcoss2                                | fv3 |
+
+####################################################################################################################################################################################
+# ATM-WAV tests                                                                                                                                                                   #
+####################################################################################################################################################################################
+
+COMPILE | -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON                                                                       | - wcoss_cray wcoss2                       | fv3 |
+RUN     | control_atmwav                                                                                                        | - wcoss_cray wcoss2                       | fv3 |
diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -548,7 +548,7 @@ ecflow_run() {
       module load ecflow
       echo "Using special Jet ECFLOW start procedure"
       MYCOMM="bash -l -c \"module load ecflow && ${ECFLOW_START} -d ${RUNDIR_ROOT}/ecflow_server\""
-      ssh $ECF_HOST "${MYCOMM}" 
+      ssh $ECF_HOST "${MYCOMM}"
     else
       ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server
     fi

diff --git a/tests/run_compile.sh b/tests/run_compile.sh
@@ -89,7 +89,7 @@ cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 # End compile job
 ################################################################################
 
-echo " $( date +%s )" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+echo " $( date +%s ), 1" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 elapsed=$SECONDS
 echo "Elapsed time $elapsed seconds. Compile ${COMPILE_NR}"
diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -23,6 +23,60 @@ write_fail_test() {
   exit 1
 }
 
+function compute_petbounds() {
+
+  # each test MUST define ${COMPONENT}_tasks variable for all components it is using
+  # and MUST NOT define those that it's not using or set the value to 0.
+
+  # ATM is a special case since it is running on the sum of compute and io tasks.
+  # CHM component and mediator are running on ATM compute tasks only.
+
+  local n=0
+  unset atm_petlist_bounds ocn_petlist_bounds ice_petlist_bounds wav_petlist_bounds chm_petlist_bounds med_petlist_bounds
+
+  # ATM
+  ATM_io_tasks=${ATM_io_tasks:-0}
+  if [[ $((ATM_compute_tasks + ATM_io_tasks)) -gt 0 ]]; then
+     atm_petlist_bounds="${n} $((n + ATM_compute_tasks + ATM_io_tasks -1))"
+     n=$((n + ATM_compute_tasks + ATM_io_tasks))
+  fi
+
+  # OCN
+  if [[ ${OCN_tasks:-0} -gt 0 ]]; then
+     ocn_petlist_bounds="${n} $((n + OCN_tasks - 1))"
+     n=$((n + OCN_tasks))
+  fi
+
+  # ICE
+  if [[ ${ICE_tasks:-0} -gt 0 ]]; then
+     ice_petlist_bounds="${n} $((n + ICE_tasks - 1))"
+     n=$((n + ICE_tasks))
+  fi
+
+  # WAV
+  if [[ ${WAV_tasks:-0} -gt 0 ]]; then
+     wav_petlist_bounds="${n} $((n + WAV_tasks - 1))"
+     n=$((n + WAV_tasks))
+  fi
+
+  # CHM
+  chm_petlist_bounds="0 $((ATM_compute_tasks - 1))"
+
+  # MED
+  med_petlist_bounds="0 $((ATM_compute_tasks - 1))"
+
+  UFS_tasks=${n}
+
+  echo "ATM_petlist_bounds: ${atm_petlist_bounds:-}"
+  echo "OCN_petlist_bounds: ${ocn_petlist_bounds:-}"
+  echo "ICE_petlist_bounds: ${ice_petlist_bounds:-}"
+  echo "WAV_petlist_bounds: ${wav_petlist_bounds:-}"
+  echo "CHM_petlist_bounds: ${chm_petlist_bounds:-}"
+  echo "MED_petlist_bounds: ${med_petlist_bounds:-}"
+  echo "UFS_tasks         : ${UFS_tasks:-}"
+
+}
+
 if [[ $# != 5 ]]; then
   echo "Usage: $0 PATHRT RUNDIR_ROOT TEST_NAME TEST_NR COMPILE_NR"
   exit 1
@@ -107,8 +161,25 @@ fi
 
 atparse < ${PATHRT}/parm/${MODEL_CONFIGURE:-model_configure.IN} > model_configure
 
+if [[ $DATM_CDEPS = 'false' ]]; then
+  if [[ ${ATM_compute_tasks:-0} -eq 0 ]]; then
+    ATM_compute_tasks=$((INPES * JNPES * NTILES))
+  fi
+  if [[ $QUILTING = '.true.' ]]; then
+    ATM_io_tasks=$((WRITE_GROUP * WRTTASK_PER_GROUP))
+  fi
+fi
+
+compute_petbounds
+
 atparse < ${PATHRT}/parm/${NEMS_CONFIGURE:-nems.configure} > nems.configure
 
+# remove after all tests pass
+if [[ $TASKS -ne $UFS_tasks ]]; then
+   echo "$TASKS -ne $UFS_tasks "
+  exit 1
+fi
+
 if [[ "Q${INPUT_NEST02_NML:-}" != Q ]] ; then
     INPES_NEST=$INPES_NEST02; JNPES_NEST=$JNPES_NEST02
     NPX_NEST=$NPX_NEST02; NPY_NEST=$NPY_NEST02
@@ -221,26 +292,20 @@ if [[ $DOCN_CDEPS = 'true' ]]; then
   atparse < ${PATHRT}/parm/${DOCN_STREAM_CONFIGURE:-docn.streams.IN} > docn.streams
 fi
 
+TPN=$(( TPN / THRD ))
+if (( TASKS < TPN )); then
+  TPN=${TASKS}
+fi
+NODES=$(( TASKS / TPN ))
+if (( NODES * TPN < TASKS )); then
+  NODES=$(( NODES + 1 ))
+fi
+
 if [[ $SCHEDULER = 'pbs' ]]; then
-  NODES=$(( TASKS / TPN ))
-  if (( NODES * TPN < TASKS )); then
-    NODES=$(( NODES + 1 ))
-  fi
   atparse < $PATHRT/fv3_conf/fv3_qsub.IN > job_card
 elif [[ $SCHEDULER = 'slurm' ]]; then
-  NODES=$(( TASKS / TPN ))
-  if (( NODES * TPN < TASKS )); then
-    NODES=$(( NODES + 1 ))
-  fi
   atparse < $PATHRT/fv3_conf/fv3_slurm.IN > job_card
 elif [[ $SCHEDULER = 'lsf' ]]; then
-  if (( TASKS < TPN )); then
-    TPN=${TASKS}
-  fi
-  NODES=$(( TASKS / TPN ))
-  if (( NODES * TPN < TASKS )); then
-    NODES=$(( NODES + 1 ))
-  fi
   atparse < $PATHRT/fv3_conf/fv3_bsub.IN > job_card
 fi
 
@@ -289,7 +354,7 @@ fi
 # End test
 ################################################################################
 
-echo " $( date +%s )" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
+echo " $( date +%s ), ${NODES}" >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
 
 ################################################################################
 # Remove RUN_DIRs if they are no longer needed by other tests

diff --git a/tests/tests/control_2threads b/tests/tests/control_2threads
@@ -65,7 +65,6 @@ export IOVR=3
 
 export THRD=2
 export TASKS=$TASKS_thrd
-export TPN=$TPN_thrd
 export INPES=$INPES_thrd
 export JNPES=$JNPES_thrd
 export WRTTASK_PER_GROUP=6