Skip to content

Commit

Permalink
Land stochastic perturbations (NOAA-EMC#57)
Browse files Browse the repository at this point in the history 
* Add regression tests with stochastic land perturbations for suites FV3_GSD_v0 and FV3_GSD_noah

Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
  • Loading branch information
@DomHeinzeller @climbfuji
DomHeinzeller and climbfuji authored Jan 9, 2021
1 parent 57a8258 commit 72d48f3
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 2 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 8 files
+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
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
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
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
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
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
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
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

0 comments on commit 72d48f3

Please sign in to comment.