From 4687e90aa2ab5a17913490238eee6594f76b5716 Mon Sep 17 00:00:00 2001
From: "denise.worthen" <Denise.Worthen@noaa.gov>
Date: Tue, 10 May 2022 17:05:20 -0400
Subject: [PATCH] intermediate commit prior to merging task PR

---
 tests/default_vars.sh             | 10 +---------
 tests/tests/cpld_2threads_p8      | 12 ++----------
 tests/tests/cpld_bmark_p8         | 20 ++++++++------------
 tests/tests/cpld_bmark_p8_35d     |  9 +++------
 tests/tests/cpld_control_c192_p8  | 12 ++++--------
 tests/tests/cpld_control_p8       |  2 +-
 tests/tests/cpld_debug_noaero_p8  |  3 ---
 tests/tests/cpld_decomp_p8        | 14 +++++---------
 tests/tests/cpld_mpi_p8           | 12 ++++--------
 tests/tests/cpld_restart_bmark_p8 | 14 +++++---------
 tests/tests/cpld_restart_c192_p8  | 13 +++++--------
 11 files changed, 38 insertions(+), 83 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index f27fb5237f..2bb32a1a6f 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -884,19 +884,11 @@ export NPZP=128
 export DOMAINS_STACK_SIZE=8000000
 
 export TASKS=$TASKS_cpl_dflt
-export TPN=$TPN_cpl_dflt
 export INPES=$INPES_cpl_dflt
 export JNPES=$JNPES_cpl_dflt
 export THRD=$THRD_cpl_dflt
 export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
-export med_petlist_bounds=$MPB_cpl_dflt
-export atm_petlist_bounds=$APB_cpl_dflt
-export chm_petlist_bounds=$CHM_cpl_dflt
-export ocn_petlist_bounds=$OPB_cpl_dflt
-export ice_petlist_bounds=$IPB_cpl_dflt
-export wav_petlist_bounds=$WPB_cpl_dflt
-
 # component and coupling timesteps
 export DT_ATMOS=720
 export DT_CICE=${DT_ATMOS}
@@ -1075,7 +1067,7 @@ export EPBL=-999.
 
 # CICE6 defaults; 1 degree
 export CICE_DECOMP=slenderX2
-export NPROC_ICE=$NPROC_ICE_cpl_dflt
+export NPROC_ICE=$ICE_tasks_cpl_dflt
 # SlenderX2
 export CICE_DECOMP=slenderX2
 export np2=`expr $NPROC_ICE / 2`
diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
index 964535f941..c43a919b9b 100644
--- a/tests/tests/cpld_2threads_p8
+++ b/tests/tests/cpld_2threads_p8
@@ -64,26 +64,18 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 
 export TASKS=$TASKS_cpl_thrd
-export TPN=$TPN_cpl_thrd
 export INPES=$INPES_cpl_thrd
 export JNPES=$JNPES_cpl_thrd
 export THRD=$THRD_cpl_thrd
 export WRTTASK_PER_GROUP=$WPG_cpl_thrd
 
-export med_petlist_bounds=$MPB_cpl_thrd
-export atm_petlist_bounds=$APB_cpl_thrd
-export chm_petlist_bounds=$CHM_cpl_thrd
-export ocn_petlist_bounds=$OPB_cpl_thrd
-export ice_petlist_bounds=$IPB_cpl_thrd
-export wav_petlist_bounds=$WPB_cpl_thrd
-
-export NPROC_ICE=$NPROC_ICE_cpl_thrd
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
index ee8fbe4b7d..1106661166 100644
--- a/tests/tests/cpld_bmark_p8
+++ b/tests/tests/cpld_bmark_p8
@@ -68,19 +68,17 @@ export FHZERO=3
 
 export DOMAINS_STACK_SIZE=16000000
 
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
+
 export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
 export THRD=$THRD_cpl_bmrk
 export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
 
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export chm_petlist_bounds=$CHM_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-export wav_petlist_bounds=$WPB_cpl_bmrk
+OCN_tasks=$OCN_tasks_cpl_bmrk
+ICE_tasks=$ICE_tasks_cpl_bmrk
+WAV_tasks=$WAV_tasks_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -95,7 +93,7 @@ export OCNRES=025
 export ICERES=0.25
 export NX_GLB=1440
 export NY_GLB=1080
-export NPROC_ICE=$NPROC_ICE_cpl_bmrk
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
@@ -117,6 +115,8 @@ export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
 export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
 export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
 export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
+export MOM6_RIVER_RUNOFF=True
+export MOM6_RESTART_SETTING=r
 
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"
@@ -132,10 +132,6 @@ export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 
-export MOM6_RIVER_RUNOFF=True
-export MOM6_RESTART_SETTING=r
-
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
index 7f1243f209..2e9d1bcb24 100644
--- a/tests/tests/cpld_bmark_p8_35d
+++ b/tests/tests/cpld_bmark_p8_35d
@@ -23,17 +23,14 @@ export RESTART_N=`expr ${FHMAX} - ${FHROT}`
 export WLCLK=120
 
 export TASKS=1700
-export TPN=$TPN_cpl_thrd
 export INPES=12
 export JNPES=16
 export THRD=2
 export WRTTASK_PER_GROUP=88
 
-export med_petlist_bounds="0 299"
-export atm_petlist_bounds="0 1239"
-export ocn_petlist_bounds="1240 1459"
-export ice_petlist_bounds="1460 1539"
-export wav_petlist_bounds="1540 1699"
+OCN_tasks=220
+ICE_tasks=80
+WAV_tasks=160
 
 # atm/ocn/ice resolution
 export ATMRES=C384
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
index 0f74031cdb..967c8824aa 100644
--- a/tests/tests/cpld_control_c192_p8
+++ b/tests/tests/cpld_control_c192_p8
@@ -69,18 +69,14 @@ export FHZERO=3
 export DOMAINS_STACK_SIZE=16000000
 
 export TASKS=$TASKS_cpl_c192
-export TPN=$TPN_cpl_c192
 export INPES=$INPES_cpl_c192
 export JNPES=$JNPES_cpl_c192
 export THRD=$THRD_cpl_c192
 export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
-export med_petlist_bounds=$MPB_cpl_c192
-export atm_petlist_bounds=$APB_cpl_c192
-export chm_petlist_bounds=$CHM_cpl_c192
-export ocn_petlist_bounds=$OPB_cpl_c192
-export ice_petlist_bounds=$IPB_cpl_c192
-export wav_petlist_bounds=$WPB_cpl_c192
+OCN_tasks=$OCN_tasks_cpl_c192
+ICE_tasks=$ICE_tasks_cpl_c192
+WAV_tasks=$WAV_tasks_cpl_c192
 
 # atm/ocn/ice resolution
 export ATMRES=C192
@@ -94,7 +90,7 @@ export OCNRES=050
 export ICERES=0.50
 export NX_GLB=720
 export NY_GLB=576
-export NPROC_ICE=$NPROC_ICE_cpl_c192
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index 780f251ad0..cdc4d71120 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -76,8 +76,8 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
index 2023dbd417..3b23a63786 100644
--- a/tests/tests/cpld_debug_noaero_p8
+++ b/tests/tests/cpld_debug_noaero_p8
@@ -56,9 +56,6 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
-# TODO: need fix to produce at fhmax
-#                   gocart.inst_aod.20210322_0900z.nc4 \
-
 export_fv3
 export_cpl
 
diff --git a/tests/tests/cpld_decomp_p8 b/tests/tests/cpld_decomp_p8
index 854f19dea5..105be37e7d 100644
--- a/tests/tests/cpld_decomp_p8
+++ b/tests/tests/cpld_decomp_p8
@@ -64,26 +64,22 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 
 export TASKS=$TASKS_cpl_dcmp
-export TPN=$TPN_cpl_dcmp
 export INPES=$INPES_cpl_dcmp
 export JNPES=$JNPES_cpl_dcmp
 export THRD=$THRD_cpl_dcmp
 export WRTTASK_PER_GROUP=$WPG_cpl_dcmp
 
-export med_petlist_bounds=$MPB_cpl_dcmp
-export atm_petlist_bounds=$APB_cpl_dcmp
-export chm_petlist_bounds=$CHM_cpl_dcmp
-export ocn_petlist_bounds=$OPB_cpl_dcmp
-export ice_petlist_bounds=$IPB_cpl_dcmp
-export wav_petlist_bounds=$WPB_cpl_dcmp
+OCN_tasks=$OCN_tasks_cpl_dcmp
+ICE_tasks=$ICE_tasks_cpl_dcmp
+WAV_tasks=$WAV_tasks_cpl_dcmp
 
-export NPROC_ICE=$NPROC_ICE_cpl_dcmp
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
 
-export eps_imesh=2.5e-1
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_mpi_p8 b/tests/tests/cpld_mpi_p8
index 95b2046700..f1cdd8e83c 100644
--- a/tests/tests/cpld_mpi_p8
+++ b/tests/tests/cpld_mpi_p8
@@ -64,20 +64,16 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 
 export TASKS=$TASKS_cpl_mpi
-export TPN=$TPN_cpl_mpi
 export INPES=$INPES_cpl_mpi
 export JNPES=$JNPES_cpl_mpi
 export THRD=$THRD_cpl_mpi
 export WRTTASK_PER_GROUP=$WPG_cpl_mpi
 
-export med_petlist_bounds=$MPB_cpl_mpi
-export atm_petlist_bounds=$APB_cpl_mpi
-export chm_petlist_bounds=$CHM_cpl_mpi
-export ocn_petlist_bounds=$OPB_cpl_mpi
-export ice_petlist_bounds=$IPB_cpl_mpi
-export wav_petlist_bounds=$WPB_cpl_mpi
+OCN_tasks=$OCN_tasks_cpl_mpi
+ICE_tasks=$ICE_tasks_cpl_mpi
+WAV_tasks=$WAV_tasks_cpl_mpi
 
-export NPROC_ICE=$NPROC_ICE_cpl_mpi
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
index 618e0fd1c7..1bfc89ec0d 100644
--- a/tests/tests/cpld_restart_bmark_p8
+++ b/tests/tests/cpld_restart_bmark_p8
@@ -70,22 +70,18 @@ export DOMAINS_STACK_SIZE=16000000
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export TASKS=$TASKS_cpl_bmrk
-export TPN=$TPN_cpl_bmrk
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
 export THRD=$THRD_cpl_bmrk
 export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
 
-export med_petlist_bounds=$MPB_cpl_bmrk
-export atm_petlist_bounds=$APB_cpl_bmrk
-export chm_petlist_bounds=$CHM_cpl_bmrk
-export ocn_petlist_bounds=$OPB_cpl_bmrk
-export ice_petlist_bounds=$IPB_cpl_bmrk
-export wav_petlist_bounds=$WPB_cpl_bmrk
+OCN_tasks=$OCN_tasks_cpl_bmrk
+ICE_tasks=$ICE_tasks_cpl_bmrk
+WAV_tasks=$WAV_tasks_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -100,7 +96,7 @@ export OCNRES=025
 export ICERES=0.25
 export NX_GLB=1440
 export NY_GLB=1080
-export NPROC_ICE=$NPROC_ICE_cpl_bmrk
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
index b8a6b0940a..e112aa10cc 100644
--- a/tests/tests/cpld_restart_c192_p8
+++ b/tests/tests/cpld_restart_c192_p8
@@ -72,19 +72,16 @@ export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $((
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export DOMAINS_STACK_SIZE=16000000
+
 export TASKS=$TASKS_cpl_c192
-export TPN=$TPN_cpl_c192
 export INPES=$INPES_cpl_c192
 export JNPES=$JNPES_cpl_c192
 export THRD=$THRD_cpl_c192
 export WRTTASK_PER_GROUP=$WPG_cpl_c192
 
-export med_petlist_bounds=$MPB_cpl_c192
-export atm_petlist_bounds=$APB_cpl_c192
-export chm_petlist_bounds=$CHM_cpl_c192
-export ocn_petlist_bounds=$OPB_cpl_c192
-export ice_petlist_bounds=$IPB_cpl_c192
-export wav_petlist_bounds=$WPB_cpl_c192
+OCN_tasks=$OCN_tasks_cpl_c192
+ICE_tasks=$ICE_tasks_cpl_c192
+WAV_tasks=$WAV_tasks_cpl_c192
 
 # atm/ocn/ice resolution
 export ATMRES=C192
@@ -98,7 +95,7 @@ export OCNRES=050
 export ICERES=0.50
 export NX_GLB=720
 export NY_GLB=576
-export NPROC_ICE=$NPROC_ICE_cpl_c192
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`