From 77f56a445c44d047837788e4082a2ccaa371f389 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 19 Jan 2021 13:04:55 -0700 Subject: [PATCH] Stochastic land perturbations: add roughness length over land to the perturbed variables (#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 --- FV3 | 2 +- stochastic_physics | 2 +- tests/parm/ccpp_gsd.nml.IN | 4 ++-- tests/parm/ccpp_gsd_sar.nml.IN | 2 ++ tests/rt_ccpp_dev.conf | 2 ++ tests/tests/fv3_ccpp_gsd_lndp | 2 +- tests/tests/fv3_ccpp_gsd_noah_lndp | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/FV3 b/FV3 index 6ecee94d0c..fa070c8349 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 6ecee94d0cdc82def576d56633a8a1ec93da39bd +Subproject commit fa070c83497debb2c34e310f7f6cdb767d282a80 diff --git a/stochastic_physics b/stochastic_physics index aeb543dbc4..b6c12628d6 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit aeb543dbc4eadb3e140db8246dee96877b69576f +Subproject commit b6c12628d64266134d39066d6e65ec8ddd5b5a22 diff --git a/tests/parm/ccpp_gsd.nml.IN b/tests/parm/ccpp_gsd.nml.IN index f4a2713f07..7d2a9e7782 100644 --- 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 index ec5c0869f2..d101d6f84f 100644 --- 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 index 47633dc20c..109c9b0e44 100644 --- 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 index 1f2ee29b9b..ab71cc1fb5 100644 --- 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 index deb060e09e..777c159993 100644 --- 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