Fix rewritten atm vars

ufs-community · Sep 30, 2024 · aa3719e · aa3719e
1 parent c643496
commit aa3719e
Show file tree

Hide file tree

Showing 35 changed files with 139 additions and 52 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -490,6 +490,12 @@ export_fv3 ()
 if [[ -z ${ATMRES+x} || -z ${ATMRES} ]]; then
     export ATMRES=C96
 fi
+if [[ -z ${DT_ATMOS+x} || -z ${DT_ATMOS} ]]; then
+    export DT_ATMOS=1800
+    export default_dt_atmos=1
+else
+    export default_dt_atmos=0
+fi
 
 # ufs.configure defaults
 export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
@@ -708,7 +714,7 @@ export LAUNCH_LEVEL=54
 export KNOB_UGWP_DOKDIS=1
 export KNOB_UGWP_NDX4LH=1
 export KNOB_UGWP_VERSION=0
-export KNOB_UGWP_PALAUNCH=275.e2
+export KNOB_UGWP_PALAUNCH=275.0e2
 export KNOB_UGWP_NSLOPE=1
 export KNOB_UGWP_LZMAX=15.750e3
 export KNOB_UGWP_LZMIN=0.75e3
@@ -736,7 +742,12 @@ export DT_INNER_c768=75
 
 # set default
 export CDMBWD=${CDMBWD_c96}
-export DT_INNER=${DT_INNER_c96}
+
+if [[ ${default_dt_atmos} = 1 ]]; then 
+  export DT_INNER=${DT_INNER_c96}
+else
+  export DT_INNER=${DT_ATMOS}
+fi
 
 export ISATMEDMF=1
 export TRANS_TRAC=.true.
@@ -1072,8 +1083,13 @@ export_ugwpv1() {
   export LDIAG_UGWP=.false.
   export KNOB_UGWP_DOKDIS=2
   export KNOB_UGWP_NDX4LH=4
-
+  
   # Add updated damping and timestep variables
+  if [[ ${default_dt_atmos} = 1 ]]; then
+  echo "DPS_A"
+  echo ${default_dt_atmos}
+  echo ${DT_ATMOS}
+
   case "${ATMRES}" in
     "C48")
       export DT_ATMOS=720
@@ -1168,7 +1184,8 @@ export_ugwpv1() {
   if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
   if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
   export DT_INNER=${DT_ATMOS}
-
+  export default_dt_atmos=0
+  fi
 }
 
 
@@ -1382,13 +1399,17 @@ export SHOUR=06
 export CHOUR=06
 export FHMAX=24
 export FHROT=0
-export DT_ATMOS=720
 export QUILTING_RESTART=.false.
 export WRTTASK_PER_GROUP=${WPG_cpl_dflt}
 export WRITE_NSFLIP=.true.
 export OUTPUT_FH='6 -1'
 
 # default atm/ocn/ice resolution
+if [[ ${default_dt_atmos} = 1 ]]; then
+    #If default DT_ATMOS is being used, set to 720 for RTs
+    export DT_ATMOS=720
+    export DT_INNER=${DT_ATMOS}
+fi
 if [[ -z ${OCNRES+x} || -z ${OCNRES} ]]; then
     export OCNRES=100
 fi
@@ -1441,7 +1462,6 @@ export FV3_RUN=cpld_control_run.IN
 export TILEDFIX=.false.
 
 export FHZERO=6
-export DT_INNER=${DT_ATMOS}
 
 export IALB=2
 export IEMS=2
@@ -1472,16 +1492,16 @@ export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
 # UGWP1
-export GWD_OPT=2
-export KNOB_UGWP_NSLOPE=1
-export DO_GSL_DRAG_LS_BL=.true.
-export DO_GSL_DRAG_SS=.true.
-export DO_UGWP_V1_OROG_ONLY=.false.
-export DO_UGWP_V0_NST_ONLY=.false.
-export LDIAG_UGWP=.false.
+#export GWD_OPT=2
+#export KNOB_UGWP_NSLOPE=1
+#export DO_GSL_DRAG_LS_BL=.true.
+#export DO_GSL_DRAG_SS=.true.
+#export DO_UGWP_V1_OROG_ONLY=.false.
+#export DO_UGWP_V0_NST_ONLY=.false.
+#export LDIAG_UGWP=.false.
 
-export DO_GSL_DRAG_TOFD=.false.
-export CDMBWD=${CDMBWD_c96}
+#export DO_GSL_DRAG_TOFD=.false.
+#export CDMBWD=${CDMBWD_c96}
 
 # RRTMGP
 export DO_RRTMGP=.false.
@@ -1490,10 +1510,10 @@ export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
 # UGWD
-export DO_UGWP_V0=.true.
-export DO_UGWP_V1=.false.
-export DO_GSL_DRAG_LS_BL=.false.
-export KNOB_UGWP_VERSION=0
+#export DO_UGWP_V0=.true.
+#export DO_UGWP_V1=.false.
+#export DO_GSL_DRAG_LS_BL=.false.
+#export KNOB_UGWP_VERSION=0
 
 # CA
 export DO_CA=.true.

diff --git a/tests/tests/atm_ds2s_docn_dice b/tests/tests/atm_ds2s_docn_dice
@@ -90,6 +90,25 @@ export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
 export WAV_tasks=0
 
+# UGWP1
+export GWD_OPT=2
+export KNOB_UGWP_NSLOPE=1
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_UGWP_V1_OROG_ONLY=.false.
+export DO_UGWP_V0_NST_ONLY=.false.
+export LDIAG_UGWP=.false.
+
+export DO_GSL_DRAG_TOFD=.false.
+export CDMBWD=${CDMBWD_c96}
+
+# UGWD
+export DO_UGWP_V0=.true.
+export DO_UGWP_V1=.false.
+export DO_GSL_DRAG_LS_BL=.false.
+export KNOB_UGWP_VERSION=0
+
+
 #CDEPS settings
 export ocn_datamode=cplhist
 export DOCN_IN_CONFIGURE=global_docn_in.IN

diff --git a/tests/tests/cpld_2threads_p8 b/tests/tests/cpld_2threads_p8
@@ -58,8 +58,8 @@ export LIST_FILES="sfcf024.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -99,6 +99,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -53,8 +53,8 @@ export LIST_FILES="sfcf006.nc \
 export ATMRES=C384
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -58,8 +58,11 @@ export LIST_FILES="sfcf030.tile1.nc \
 
 export ATMRES=C192
 export_fv3
+export_ugwpv1
 export_cpl
 
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
+
 export DAYS=1.25
 export FHMAX=30
 export RESTART_N=15

diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48
@@ -55,9 +55,8 @@ export LIST_FILES="sfcf024.tile1.nc \
 export ATMRES=C48
 
 export_fv3
-export_cpl
 export_ugwpv1
-
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12

diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -90,6 +90,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
@@ -51,8 +51,8 @@ export LIST_FILES="sfcf024.nc \
                    20210323.120000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0

diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12

diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
 #TODO: add comparison of CA restart files?
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -92,6 +92,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -93,6 +93,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_p8_faster b/tests/tests/cpld_control_p8_faster
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -88,6 +88,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_UGWP_V0=.false.

diff --git a/tests/tests/cpld_control_p8_mixedmode b/tests/tests/cpld_control_p8_mixedmode
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -88,6 +88,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export RESTART_N=12
@@ -112,6 +112,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_qr_p8 b/tests/tests/cpld_control_qr_p8
@@ -70,8 +70,8 @@ export LIST_FILES="sfcf021.tile1.nc \
                    20210323.060000.out_grd.ww3 "
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export QUILTING_RESTART=.true.
@@ -89,6 +89,8 @@ export DT_INNER=720
 export DT_ATMOS=720
 export K_SPLIT=4
 export N_SPLIT=5
+export DT_CICE=${DT_ATMOS}
+export coupling_interval_fast_sec=${DT_ATMOS}
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs
@@ -18,8 +18,8 @@ export LIST_FILES="sfcf021.nc \
                    RESTART/20210323.060000.MOM.res.nc" 
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
 export CPLCHM=.false.
 export DNATS=0