Stochastic land perturbations: add roughness length over land to the …

…perturbed variables (NOAA-EMC#61) * Updates to regression tests fv3_ccpp_gsd_lndp and fv3_ccpp_gsd_noah_lndp * Bug fix for tests/parm/ccpp_gsd_sar.nml.IN
zhanglikate · Jan 19, 2021 · 77f56a4 · 77f56a4
1 parent 72d48f3
commit 77f56a4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/FV3 b/FV3
diff --git a/stochastic_physics b/stochastic_physics
diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN
@@ -326,8 +326,8 @@
   LNDP_TAU=21600,
   LNDP_LSCALE=500000,
   ISEED_LNDP=2010,
-  lndp_var_list = 'vgf','alb','sal'
-  lndp_prt_list = 0.02,0.01,0.01
+  lndp_var_list = 'smc', 'vgf', 'alb', 'sal', 'emi', 'zol'
+  lndp_prt_list = 0.200, 0.001, 0.001, 0.001, 0.001, 0.001
 /
 
 &cires_ugwp_nml

diff --git a/tests/parm/ccpp_gsd_sar.nml.IN b/tests/parm/ccpp_gsd_sar.nml.IN
@@ -277,6 +277,7 @@
      FABSL    = 99999,
      FSNOS    = 99999,
      FSICS    = 99999,
+/
 
 &nam_stochy
      lon_s=768,
@@ -300,6 +301,7 @@
      ISEED_SKEB=2,
      ISEED_SPPT=3,
 /
+
 &nam_sfcperts
      lndp_type      = @[LNDP_TYPE]
      LNDP_TAU=21600,

diff --git a/tests/rt_ccpp_dev.conf b/tests/rt_ccpp_dev.conf
@@ -1,4 +1,6 @@
 #################################################################################################################################################################################
+# Note: this file has been used for testing additional physics on Hera and Cheyenne with both Intel and GNU                                                                     #
+#                                                                                                                                                                               #
 # CCPP REPRO tests                                                                                                                                                              #
 #################################################################################################################################################################################
 

diff --git a/tests/tests/fv3_ccpp_gsd_lndp b/tests/tests/fv3_ccpp_gsd_lndp
@@ -94,7 +94,7 @@ export LSOIL_LSM=9
 export KICE=9
 
 export LNDP_TYPE=2
-export N_VAR_LNDP=3
+export N_VAR_LNDP=6
 export LNDP_EACH_STEP=.T.
 
 #export WLCLK=30
diff --git a/tests/tests/fv3_ccpp_gsd_noah_lndp b/tests/tests/fv3_ccpp_gsd_noah_lndp
@@ -93,7 +93,7 @@ export LSM=1
 export LSOIL_LSM=4
 
 export LNDP_TYPE=2
-export N_VAR_LNDP=3
+export N_VAR_LNDP=6
 export LNDP_EACH_STEP=.T.
 
 #export WLCLK=30