Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stochastic land perturbations: add roughness length over land to the perturbed variables #61

Merged
merged 5 commits into from
Jan 19, 2021
Merged

Stochastic land perturbations: add roughness length over land to the perturbed variables #61

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e6a698
Updates to regression tests fv3_ccpp_gsd_lndp and fv3_ccpp_gsd_noah_l…
climbfuji Jan 16, 2021
41b5794
Update .gitmodules and submodule pointers for fv3atm and stochastic_p…
climbfuji Jan 16, 2021
f85b261
Update submodule pointer for fv3atm
climbfuji Jan 17, 2021
ed4fa06
Update submodule pointer for fv3atm
climbfuji Jan 19, 2021
804138c
Revert change to .gitmodules and update submodule pointers for stocha…
climbfuji Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-GSL/fv3atm
branch = gsl/develop
#url = https://github.com/NOAA-GSL/fv3atm
#branch = gsl/develop
url = https://github.com/tanyasmirnova/fv3atm
branch = gsl_stoch_zorl
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand All @@ -16,8 +18,10 @@
branch = develop
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-gsl/stochastic_physics
branch = gsl/develop
#url = https://github.com/noaa-gsl/stochastic_physics
#branch = gsl/develop
url = https://github.com/tanyasmirnova/stochastic_physics
branch = gsl_stoch_zorl
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/NOAA-EMC/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 3 files
+1 −1 ccpp/physics
+4 −9 gfsphysics/GFS_layer/GFS_typedefs.F90
+7 −1 stochastic_physics/stochastic_physics_wrapper.F90
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated 2 files
+1 −1 compns_stochy.F90
+12 −1 lndp_apply_perts.F90
4 changes: 2 additions & 2 deletions tests/parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tests/parm/ccpp_gsd_sar.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
FABSL = 99999,
FSNOS = 99999,
FSICS = 99999,
/

&nam_stochy
lon_s=768,
Expand All @@ -300,6 +301,7 @@
ISEED_SKEB=2,
ISEED_SPPT=3,
/

&nam_sfcperts
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
Expand Down
2 changes: 2 additions & 0 deletions tests/rt_ccpp_dev.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 #
#################################################################################################################################################################################

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_noah_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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