[develop] Update scripts to run with the latest hash of ufs weather model

ush/config_defaults.sh

@@ -1901,10 +1901,6 @@ ISEED_SPP=( "4" "5" "6" "7" "8" )
 # SPP in LSM schemes is handled in the &nam_sfcperts namelist block 
 # instead of in &nam_sppperts, where all other SPP is implemented.
 #
-# The default perturbation frequency is determined by the fhcyc namelist 
-# entry.  Since that parameter is set to zero in the SRW App, use 
-# LSM_SPP_EACH_STEP to perturb every time step. 
-#
 # Perturbations to soil moisture content (SMC) are only applied at the 
 # first time step.
 #
@@ -1916,13 +1912,12 @@ ISEED_SPP=( "4" "5" "6" "7" "8" )
 # are shown below.  In addition, only one unique iseed value is allowed 
 # at the moment, and is used for each pattern.
 #
-DO_LSM_SPP="false" #If true, sets lndp_type=2
+DO_LSM_SPP="false" #If true, sets lndp_type=2, lndp_model_type=2
 LSM_SPP_TSCALE=( "21600" "21600" "21600" "21600" "21600" "21600" "21600" )
 LSM_SPP_LSCALE=( "150000" "150000" "150000" "150000" "150000" "150000" "150000" )
 ISEED_LSM_SPP=( "9" )
 LSM_SPP_VAR_LIST=( "smc" "vgf" "alb" "sal" "emi" "zol" "stc" )
 LSM_SPP_MAG_LIST=( "0.017" "0.001" "0.001" "0.001" "0.001" "0.001" "0.2" )
-LSM_SPP_EACH_STEP="true" #Sets lndp_each_step=.true.
 #
 #-----------------------------------------------------------------------
 # 

ush/config_defaults.yaml

@@ -1888,10 +1888,6 @@ ISEED_SPP: [ "4", "4", "4", "4", "4" ]
 # SPP in LSM schemes is handled in the &nam_sfcperts namelist block 
 # instead of in &nam_sppperts, where all other SPP is implemented.
 #
-# The default perturbation frequency is determined by the fhcyc namelist 
-# entry.  Since that parameter is set to zero in the SRW App, use 
-# LSM_SPP_EACH_STEP to perturb every time step. 
-#
 # Perturbations to soil moisture content (SMC) are only applied at the 
 # first time step.
 #
@@ -1903,13 +1899,12 @@ ISEED_SPP: [ "4", "4", "4", "4", "4" ]
 # are shown below.  In addition, only one unique iseed value is allowed 
 # at the moment, and is used for each pattern.
 #
-DO_LSM_SPP: "FALSE" #If true, sets lndp_type=2
+DO_LSM_SPP: "FALSE" #If true, sets lndp_type=2, lndp_model_type=2
 LSM_SPP_TSCALE: [ "21600", "21600", "21600", "21600", "21600", "21600", "21600" ]
 LSM_SPP_LSCALE: [ "150000", "150000", "150000", "150000", "150000", "150000", "150000" ]
 ISEED_LSM_SPP: [ "9" ]
 LSM_SPP_VAR_LIST: [ "smc", "vgf", "alb", "sal", "emi", "zol", "stc" ]
-LSM_SPP_MAG_LIST: [ "0.2", "0.001", "0.001", "0.001", "0.001", "0.001", "0.2" ]
-LSM_SPP_EACH_STEP: "TRUE" #Sets lndp_each_step=.true.
+LSM_SPP_MAG_LIST: [ "0.017", "0.001", "0.001", "0.001", "0.001", "0.001", "0.2" ]
 #
 #-----------------------------------------------------------------------
 # 

ush/generate_FV3LAM_wflow.py

@@ -737,7 +737,6 @@ def generate_FV3LAM_wflow():
         'n_var_spp': N_VAR_SPP,
         'n_var_lndp': N_VAR_LNDP,
         'lndp_type': LNDP_TYPE,
-        'lndp_each_step': LSM_SPP_EACH_STEP,
         'fhcyc': FHCYC_LSM_SPP_OR_NOT
     }
     #
@@ -865,6 +864,7 @@ def generate_FV3LAM_wflow():
     if DO_LSM_SPP:
       nam_sfcperts_dict = {
         'lndp_type': LNDP_TYPE,
+        'lndp_model_type': LNDP_MODEL_TYPE,
         'lndp_tau': LSM_SPP_TSCALE,
         'lndp_lscale': LSM_SPP_LSCALE,
         'iseed_lndp': ISEED_LSM_SPP,

ush/generate_FV3LAM_wflow.sh

@@ -789,7 +789,6 @@ settings="\
     'n_var_spp': ${N_VAR_SPP},
     'n_var_lndp': ${N_VAR_LNDP},
     'lndp_type': ${LNDP_TYPE},
-    'lndp_each_step': ${LSM_SPP_EACH_STEP},
     'fhcyc': ${FHCYC_LSM_SPP_OR_NOT}, 
   }"
 #
@@ -932,6 +931,7 @@ settings="$settings
 if [ "${DO_LSM_SPP}" = "TRUE" ]; then 
     settings="$settings
     'lndp_type': ${LNDP_TYPE},
+    'lndp_model_type': ${LNDP_MODEL_TYPE},
     'lndp_tau': [ $( printf "%s, " "${LSM_SPP_TSCALE[@]}" ) ],
     'lndp_lscale': [ $( printf "%s, " "${LSM_SPP_LSCALE[@]}" ) ],
     'iseed_lndp': [ $( printf "%s, " "${ISEED_LSM_SPP[@]}" ) ],

ush/setup.py

@@ -167,13 +167,15 @@ def setup():
     #
     #-----------------------------------------------------------------------
     #
-    global N_VAR_LNDP, LNDP_TYPE, FHCYC_LSM_SPP_OR_NOT
+    global N_VAR_LNDP, LNDP_TYPE, LNDP_MODEL_TYPE, FHCYC_LSM_SPP_OR_NOT
     N_VAR_LNDP=0
     LNDP_TYPE=0
+    LNDP_MODEL_TYPE=0
     FHCYC_LSM_SPP_OR_NOT=0
     if DO_LSM_SPP:
       N_VAR_LNDP=len(LSM_SPP_VAR_LIST)
       LNDP_TYPE=2
+      LNDP_MODEL_TYPE=2
       FHCYC_LSM_SPP_OR_NOT=999
     #
     #-----------------------------------------------------------------------
@@ -2163,6 +2165,7 @@ def setup():
         N_VAR_SPP='{N_VAR_SPP}'
         N_VAR_LNDP='{N_VAR_LNDP}'
         LNDP_TYPE='{LNDP_TYPE}'
+        LNDP_MODEL_TYPE='{LNDP_MODEL_TYPE}'
         FHCYC_LSM_SPP_OR_NOT='{FHCYC_LSM_SPP_OR_NOT}'
         """
 

ush/setup.sh

@@ -286,10 +286,12 @@ fi
 #
 N_VAR_LNDP=0
 LNDP_TYPE=0
+LNDP_MODEL_TYPE=0
 FHCYC_LSM_SPP_OR_NOT=0
 if [ "${DO_LSM_SPP}" = "TRUE" ]; then
   N_VAR_LNDP=${#LSM_SPP_VAR_LIST[@]}
   LNDP_TYPE=2
+  LNDP_MODEL_TYPE=2
   FHCYC_LSM_SPP_OR_NOT=999
 fi
 #
@@ -2808,6 +2810,7 @@ PE_MEMBER01='${PE_MEMBER01}'
 N_VAR_SPP='${N_VAR_SPP}'
 N_VAR_LNDP='${N_VAR_LNDP}'
 LNDP_TYPE='${LNDP_TYPE}'
+LNDP_MODEL_TYPE='${LNDP_MODEL_TYPE}'
 FHCYC_LSM_SPP_OR_NOT='${FHCYC_LSM_SPP_OR_NOT}'
 "
 #

ush/templates/FV3.input.yml

@@ -30,6 +30,7 @@ FV3_RRFS_v1alpha:
     iopt_snf: 4
     iopt_stc: 1
     iopt_tbot: 2
+    iopt_trs: 2
     lsm: 2
     lsoil_lsm: 4
 
@@ -64,6 +65,7 @@ FV3_HRRR:
     iovr: 3
     lsm: 3
     lsoil_lsm: 9
+    sfclay_compute_flux: True
 
 FV3_GFS_2017_gfdlmp:
   atmos_model_nml:
@@ -182,6 +184,7 @@ FV3_GFS_2017_gfdlmp_regional:
     iopt_snf: 4
     iopt_stc: 1
     iopt_tbot: 2
+    iopt_trs: 2
     lgfdlmprad: True
     lheatstrg: False
     lndp_type: 0
@@ -256,6 +259,7 @@ FV3_GFS_v15p2:
     iopt_snf: 4
     iopt_stc: 1
     iopt_tbot: 2
+    iopt_trs: 2
     ldiag_ugwp: False
     lgfdlmprad: True
     lradar: !!python/none
@@ -310,6 +314,7 @@ FV3_GFS_v15_thompson_mynn_lam3km:
     iopt_snf: 4
     iopt_stc: 1
     iopt_tbot: 2
+    iopt_trs: 2
     iovr: 3
     ldiag_ugwp: false
     lgfdlmprad: false

ush/templates/input.nml.FV3

@@ -47,7 +47,7 @@
 
 &fms_nml
     clock_grain = 'ROUTINE'
-    domains_stack_size = 3000000
+    domains_stack_size = 5000000
     print_memory_usage = .false.
 /
 
@@ -184,6 +184,7 @@
     random_clds = .false.
     redrag = .true.
     satmedmf = .false.
+    sfclay_compute_flux = .false.
     shal_cnv = .false.
     swhtr = .true.
     trans_trac = .true.