update default vars

* comment out settings in tests which are defaults
DeniseWorthen · Mar 22, 2022 · ae77588 · ae77588
1 parent f95a76a
commit ae77588
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 129 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -564,11 +564,11 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
   TASKS_cpl_atmw_gdas=576; TPN_cpl_atmw_gdas=12; INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8
   THRD_cpl_atmw_gdas=3; WPG_cpl_atmw_gdas=24; APB_cpl_atmw_gdas="0 311"; WPB_cpl_atmw_gdas="312 575"
 
-  TASKS_cpl_c96=212; TPN_cpl_c96=36; INPES_cpl_c96=3; JNPES_cpl_c96=8
-  THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
-  CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
-  WPB_cpl_c96="192 211"
-  NPROC_ICE_cpl_c96=12
+  #TASKS_cpl_c96=212; TPN_cpl_c96=36; INPES_cpl_c96=3; JNPES_cpl_c96=8
+  #THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
+  #CHM_cpl_c96="0 143"; OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
+  #WPB_cpl_c96="192 211"
+  #NPROC_ICE_cpl_c96=12
 
   TASKS_cpl_dflt=200; TPN_cpl_dflt=36; 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"
@@ -1250,6 +1250,7 @@ export CPLICE=.true.
 export CPL=.true.
 export CPLWAV=.true.
 export CPLWAV2ATM=.true.
+export CPLCHM=.true.
 
 # for FV3: default values will be changed if doing a warm-warm restart
 export WARM_START=.false.
@@ -1305,6 +1306,11 @@ export CICE_HIST_AVG=.true.
 #wave
 export INPUT_CURFLD='T F     Currents'
 export INPUT_ICEFLD='T F     Ice concentrations'
+export WW3RSTDTHR=3
+export WW3OUTDTHR=3
+export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export WW3GRIDLINE="'ww3'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
 export UNIPOINTS='points'
 export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -129,17 +129,18 @@ export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c192}
 export DT_INNER=${DT_INNER_c192}
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-
-export CPLCHM=.true.
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+#
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
@@ -125,17 +125,18 @@ export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-
-export CPLCHM=.true.
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+#
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
@@ -78,41 +78,46 @@ export RESTART_N=12
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH='0 21 24'
 
-export TASKS=$TASKS_cpl_c96
-export TPN=$TPN_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-export med_petlist_bounds=$MPB_cpl_c96
-export atm_petlist_bounds=$APB_cpl_c96
-export chm_petlist_bounds=$CHM_cpl_c96
-export ocn_petlist_bounds=$OPB_cpl_c96
-export ice_petlist_bounds=$IPB_cpl_c96
-export wav_petlist_bounds=$WPB_cpl_c96
+#Set as cpl_dflt
+#export TASKS=$TASKS_cpl_c96
+#export TPN=$TPN_cpl_c96
+#export INPES=$INPES_cpl_c96
+#export JNPES=$JNPES_cpl_c96
+#export THRD=$THRD_cpl_c96
+#export WRTTASK_PER_GROUP=$WPG_cpl_c96
+#
+#export med_petlist_bounds=$MPB_cpl_c96
+#export atm_petlist_bounds=$APB_cpl_c96
+#export chm_petlist_bounds=$CHM_cpl_c96
+#export ocn_petlist_bounds=$OPB_cpl_c96
+#export ice_petlist_bounds=$IPB_cpl_c96
+#export wav_petlist_bounds=$WPB_cpl_c96
 
 # atm/ocn/ice resolution
-export NPROC_ICE=$NPROC_ICE_cpl_c96
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
+#export NPROC_ICE=$NPROC_ICE_cpl_c96
+#export np2=`expr $NPROC_ICE / 2`
+#export BLCKX=`expr $NX_GLB / $np2`
+#export BLCKY=`expr $NY_GLB / 2`
 
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#Set as default
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
-export CPLCHM=.true.
+#TODO: retain aero? or make noareo?
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#Set as default
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_c96_p8 b/tests/tests/cpld_debug_c96_p8
@@ -66,41 +66,42 @@ export DAYS=0.125
 export RESTART_N=${FHMAX}
 export OUTPUT_FH="3 -1"
 
-export TASKS=$TASKS_cpl_c96
-export TPN=$TPN_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-export med_petlist_bounds=$MPB_cpl_c96
-export atm_petlist_bounds=$APB_cpl_c96
-export chm_petlist_bounds=$CHM_cpl_c96
-export ocn_petlist_bounds=$OPB_cpl_c96
-export ice_petlist_bounds=$IPB_cpl_c96
-export wav_petlist_bounds=$WPB_cpl_c96
-
-# atm/ocn/ice resolution
-export NPROC_ICE=$NPROC_ICE_cpl_c96
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
+#export TASKS=$TASKS_cpl_c96
+#export TPN=$TPN_cpl_c96
+#export INPES=$INPES_cpl_c96
+#export JNPES=$JNPES_cpl_c96
+#export THRD=$THRD_cpl_c96
+#export WRTTASK_PER_GROUP=$WPG_cpl_c96
+#
+#export med_petlist_bounds=$MPB_cpl_c96
+#export atm_petlist_bounds=$APB_cpl_c96
+#export chm_petlist_bounds=$CHM_cpl_c96
+#export ocn_petlist_bounds=$OPB_cpl_c96
+#export ice_petlist_bounds=$IPB_cpl_c96
+#export wav_petlist_bounds=$WPB_cpl_c96
+#
+## atm/ocn/ice resolution
+#export NPROC_ICE=$NPROC_ICE_cpl_c96
+#export np2=`expr $NPROC_ICE / 2`
+#export BLCKX=`expr $NX_GLB / $np2`
+#export BLCKY=`expr $NY_GLB / 2`
 
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+#
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
-export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -156,17 +156,18 @@ export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-
-export CPLCHM=.true.
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+#
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_c384_p8
@@ -153,17 +153,18 @@ export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
-export WW3RSTDTHR=3
-export WW3OUTDTHR=3
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-
-export CPLCHM=.true.
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+#
+#export WW3RSTDTHR=3
+#export WW3OUTDTHR=3
+#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
+#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
@@ -92,41 +92,42 @@ export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
-export TASKS=$TASKS_cpl_c96
-export TPN=$TPN_cpl_c96
-export INPES=$INPES_cpl_c96
-export JNPES=$JNPES_cpl_c96
-export THRD=$THRD_cpl_c96
-export WRTTASK_PER_GROUP=$WPG_cpl_c96
-
-export med_petlist_bounds=$MPB_cpl_c96
-export atm_petlist_bounds=$APB_cpl_c96
-export chm_petlist_bounds=$CHM_cpl_c96
-export ocn_petlist_bounds=$OPB_cpl_c96
-export ice_petlist_bounds=$IPB_cpl_c96
-export wav_petlist_bounds=$WPB_cpl_c96
-
-# atm/ocn/ice resolution
-export NPROC_ICE=$NPROC_ICE_cpl_c96
-export np2=`expr $NPROC_ICE / 2`
-export BLCKX=`expr $NX_GLB / $np2`
-export BLCKY=`expr $NY_GLB / 2`
+#export TASKS=$TASKS_cpl_c96
+#export TPN=$TPN_cpl_c96
+#export INPES=$INPES_cpl_c96
+#export JNPES=$JNPES_cpl_c96
+#export THRD=$THRD_cpl_c96
+#export WRTTASK_PER_GROUP=$WPG_cpl_c96
+#
+#export med_petlist_bounds=$MPB_cpl_c96
+#export atm_petlist_bounds=$APB_cpl_c96
+#export chm_petlist_bounds=$CHM_cpl_c96
+#export ocn_petlist_bounds=$OPB_cpl_c96
+#export ice_petlist_bounds=$IPB_cpl_c96
+#export wav_petlist_bounds=$WPB_cpl_c96
+#
+## atm/ocn/ice resolution
+#export NPROC_ICE=$NPROC_ICE_cpl_c96
+#export np2=`expr $NPROC_ICE / 2`
+#export BLCKX=`expr $NX_GLB / $np2`
+#export BLCKY=`expr $NY_GLB / 2`
 
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export CPLWAV=.true.
-export CPLWAV2ATM=.true.
-export MOM6_USE_WAVES=True
+#export CPLCHM=.true.
+#export CPLWAV=.true.
+#export CPLWAV2ATM=.true.
+#export MOM6_USE_WAVES=True
+
 export WW3RSTDTHR=3
 export WW3OUTDTHR=3
 export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
 export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
-export CPLCHM=.true.
 export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
+#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
 
 export FV3_RUN=cpld_control_run.IN