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

Jump to bottom

Land stochastic perturbations #57

Merged
merged 6 commits into from
Jan 9, 2021
Merged

Land stochastic perturbations #57

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dea86af
Update .gitmodules and submodule pointers for fv3atm and stochastic_p…
climbfuji Dec 29, 2020
18074a6
Add regression tests with stochastic land perturbations for suites FV…
climbfuji Dec 30, 2020
d866bef
Add logic to regression tests to apply land surface perturbations at …
climbfuji Dec 30, 2020
87c8843
Update submodule pointer for stochastic_physics
climbfuji Dec 30, 2020
56051ef
Update submodule pointers for stochastic_physics and fv3atm
climbfuji Jan 8, 2021
5aff581
Revert change to .gitmdoules and update submodule pointers for fv3atm…
climbfuji Jan 9, 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/climbfuji/fv3atm
branch = land-stoch-pert-dom
[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_landstoch_withruc
[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 9 files
+4 −2 .gitmodules
+6 −3 atmos_model.F90
+0 −1 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/physics
+0 −1 ccpp/suites/suite_FV3_GSD_noah.xml
+0 −1 ccpp/suites/suite_FV3_GSD_v0.xml
+21 −5 gfsphysics/GFS_layer/GFS_typedefs.F90
+14 −0 gfsphysics/GFS_layer/GFS_typedefs.meta
+97 −18 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
+148 −64 lndp_apply_perts.F90
1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ export DO_SHUM=.F.
export DO_SKEB=.F.
export LNDP_TYPE=0
export N_VAR_LNDP=0
export LNDP_EACH_STEP=.F.
export SKEB=-999.
export SPPT=-999.
export SHUM=-999.
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
do_skeb = @[DO_SKEB]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lndp_each_step = @[LNDP_EACH_STEP]
lsm = @[LSM]
lsoil_lsm = @[LSOIL_LSM]
kice = @[KICE]
Expand Down Expand Up @@ -325,6 +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
/

&cires_ugwp_nml
Expand Down
1 change: 1 addition & 0 deletions tests/parm/ccpp_lndp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
do_skeb = @[DO_SKEB]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lndp_each_step = @[LNDP_EACH_STEP]
do_ca = .false.
ca_sgs = .false.
nca = 1
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
Expand Up @@ -9,7 +9,9 @@ RUN | fv3_ccpp_gf_thompson
RUN | fv3_ccpp_gsd | standard | | fv3 |
RUN | fv3_ccpp_gsd_coldstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart
RUN | fv3_ccpp_gsd_lndp | standard | | fv3 |
RUN | fv3_ccpp_gsd_noah | standard | | fv3 |
RUN | fv3_ccpp_gsd_noah_lndp | standard | | fv3 |

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | | fv3 |

Expand Down
100 changes: 100 additions & 0 deletions tests/tests/fv3_ccpp_gsd_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
#########################################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) with land stochastic pert test
#
#########################################################################################

export TEST_DESCR="Compare FV3 CCPP GSD lndp results with previous trunk version"

export CNTL_DIR=fv3_gsd_lndp

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"

export_fv3

export DT_ATMOS="600"
export IMP_PHYSICS=8
export DNATS=0
export DO_SAT_ADJ=.F.
export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GSD_v0
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export KICE=9

export LNDP_TYPE=2
export N_VAR_LNDP=3
export LNDP_EACH_STEP=.T.

#export WLCLK=30
99 changes: 99 additions & 0 deletions tests/tests/fv3_ccpp_gsd_noah_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
##########################################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) with land stochastic pert test
#
##########################################################################################

export TEST_DESCR="Compare FV3 CCPP GSD lndp results with previous trunk version"

export CNTL_DIR=fv3_gsd_noah_lndp

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"

export_fv3

export DT_ATMOS="600"
export IMP_PHYSICS=8
export DNATS=0
export DO_SAT_ADJ=.F.
export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GSD_noah
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=1
export LSOIL_LSM=4

export LNDP_TYPE=2
export N_VAR_LNDP=3
export LNDP_EACH_STEP=.T.

#export WLCLK=30