Change damping parameters to match new GW values

This commit changes the damping parameters in default_vars.sh
and global_control.nml.IN to reflect new optimal values that
are going to be used in the global workflow.

tests/default_vars.sh

@@ -534,6 +534,14 @@ export IMO=384
 export JMO=190
 export WRITE_NSFLIP=.true.
 
+# New damping coefficients made the following
+#   dynamic based on resolution
+export N_SPLIT=5
+export K_SPLIT=2
+export TAU=0.0
+export RF_CUTOFF=10.
+export FV_SG_ADJ=450
+
 export DZ_MIN=6
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
@@ -632,6 +640,7 @@ export KNOB_UGWP_NDX4LH=1
 export KNOB_UGWP_VERSION=0
 export KNOB_UGWP_PALAUNCH=500.e2
 export KNOB_UGWP_NSLOPE=1
+export KNOB_UGWP_TAUAMP=3.0e-3
 export DO_UGWP_V0_NST_ONLY=.false.
 
 # resolution dependent settings
@@ -899,6 +908,97 @@ export FNVMXC="'${ATMRES}.vegetation_greenness.tileX.nc'"
 export FNSLPC="'${ATMRES}.slope_type.tileX.nc'"
 export FNABSC="'${ATMRES}.maximum_snow_albedo.tileX.nc'"
 export LANDICE=".false."
+# Add updated damping and timestep variables
+case "${ATMRES}" in
+  "C48")
+    export DELTIM=1200
+    export XR_CNVCLD=.false.
+    export CDMBGWD="0.071,2.1,1.0,1.0"
+    export CDMBGWD_GSL="40.0,1.77,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=6.0e-3
+    #export K_SPLIT=1
+    export N_SPLIT=4
+    export TAU=10.0
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=3600
+    ;;
+  "C96")
+    export DELTIM=600
+    export XR_CNVCLD=.false.
+    export CDMBGWD="0.14,1.8,1.0,1.0"
+    export CDMBGWD_GSL="20.0,2.5,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=3.0e-3
+    #export K_SPLIT=1
+    export N_SPLIT=4
+    export TAU=8.0
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=1800
+    ;;
+  "C192")
+    export DELTIM=600
+    export XR_CNVCLD=.true.
+    export CDMBGWD="0.23,1.5,1.0,1.0"
+    export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=1.5e-3
+    #export K_SPLIT=2
+    export N_SPLIT=4
+    export TAU=6.0
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=1800
+    ;;
+  "C384")
+    export DELTIM=300
+    export XR_CNVCLD=.true.
+    export CDMBGWD="1.1,0.72,1.0,1.0"
+    export CDMBGWD_GSL="5.0,5.0,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=0.8e-3
+    #export K_SPLIT=2
+    export N_SPLIT=4
+    export TAU=4.0
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=900
+    ;;
+  "C768")
+    export DELTIM=150
+    export XR_CNVCLD=.true.
+    export CDMBGWD="4.0,0.15,1.0,1.0"
+    export CDMBGWD_GSL="2.5,7.5,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=0.5e-3
+    #export K_SPLIT=2
+    export N_SPLIT=4
+    export TAU=3.0
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=450
+    ;;
+  "C1152")
+    export DELTIM=150
+    export XR_CNVCLD=.true.
+    export CDMBGWD="4.0,0.10,1.0,1.0"
+    export CDMBGWD_GSL="1.67,8.8,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=0.35e-3
+    #export K_SPLIT=2
+    export N_SPLIT=6
+    export TAU=2.5
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=450
+    ;;
+  "C3072")
+    export DELTIM=90
+    export XR_CNVCLD=.true.
+    export CDMBGWD="4.0,0.05,1.0,1.0"
+    export CDMBGWD_GSL="0.625,14.1,1.0,1.0"
+    export KNOB_UGWP_TAUAMP=0.13e-3
+    #export K_SPLIT=4
+    export N_SPLIT=5
+    export TAU=0.5
+    export RF_CUTOFF=100.0
+    export FV_SG_ADJ=300
+    ;;
+  *)
+    echo Invalid model resolution: ${ATMRES}. Please update specified variable ATMRES.
+    exit 1
+    ;;
+  esac
 }
 
 # Defaults for the CICE6 model namelist, mx100

tests/parm/global_control.nml.IN

@@ -37,9 +37,9 @@
   n_sponge = 42
   nudge_qv = .true.
   nudge_dz = .false.
-  tau = 0.0
+  tau = @[TAU]
   fast_tau_w_sec = 0.2
-  rf_cutoff = 10.
+  rf_cutoff = @[RF_CUTOFF]
   d2_bg_k1 = @[D2_BG_K1]
   d2_bg_k2 = @[D2_BG_K2]
   kord_tm = @[KORD_TM]
@@ -52,13 +52,13 @@
   beta = 0.
   a_imp = 1.
   p_fac = 0.1
-  k_split = 2
-  n_split = 5
+  k_split = @[K_SPLIT]
+  n_split = @[N_SPLIT]
   nwat = 6
   na_init = @[NA_INIT]
   d_ext = 0.
   dnats = @[DNATS]
-  fv_sg_adj = 450
+  fv_sg_adj = @[FV_SG_ADJ]
   d2_bg = 0.
   nord = 2
   dddmp = @[DDDMP]
@@ -272,7 +272,7 @@
 @[HIDE_UGWPV1] knob_ugwp_lzmin    = 0.75e3
 @[HIDE_UGWPV1] knob_ugwp_lzstar   = 2.0e3
 @[HIDE_UGWPV1] knob_ugwp_taumin   = 0.25e-3
-@[HIDE_UGWPV1] knob_ugwp_tauamp   = 3.0e-3
+@[HIDE_UGWPV1] knob_ugwp_tauamp   = @[KNOB_UGWP_TAUAMP]
 @[HIDE_UGWPV1] knob_ugwp_lhmet    = 200.0e3
 @[HIDE_UGWPV1] knob_ugwp_orosolv  = 'pss-1986'
 /

tests/tests/control_p8_ugwpv1

@@ -95,6 +95,7 @@ export LHEATSTRG=.false.
 export LSEASPRAY=.true.
 
 # UGWP1
+export K_SPLIT=4
 export GWD_OPT=2
 export CDMBWD=20.0,2.5,1.0,1.0
 export DO_UGWP_V1=.true.