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

Update develop from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations #386

Merged
merged 20 commits into from
Jan 22, 2021
Merged

Update develop from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations #386

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ff98902
Update .gitmodules and submodule pointer for fv3atm for gsl/develop b…
climbfuji Nov 25, 2020
d4de9e6
RUC ice for gsl/develop (replaces #47) (#49)
DomHeinzeller Dec 1, 2020
7a249f2
Update gsl/develop from develop 2020/12/08 (#50)
climbfuji Dec 8, 2020
d5fa4c1
Update submodule pointer for fv3atm / ccpp-physics - MYNN surface lay…
climbfuji Dec 16, 2020
57a8258
Update stochastic_physics submodule to point to NOAA-GSL gsl/develop …
climbfuji Dec 18, 2020
72d48f3
Land stochastic perturbations (#57)
DomHeinzeller Jan 9, 2021
77f56a4
Stochastic land perturbations: add roughness length over land to the …
climbfuji Jan 19, 2021
0315aa2
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jan 20, 2021
94ad00e
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Jan 20, 2021
4662cc2
Update submodule pointer for fv3atm; skip-ci
climbfuji Jan 20, 2021
b0a8ddc
Update regression test baseline tag in tests/rt.sh; skip-ci
climbfuji Jan 20, 2021
7429f86
No longer compile all suites on gaea.intel
climbfuji Jan 21, 2021
a19921b
Regression test logs for cheyenne.{gnu,intel}, hera.{gnu,intel}, gaea…
climbfuji Jan 21, 2021
d496ba0
Regression test logs for wcoss_dell_p3 and wcoss_cray
climbfuji Jan 21, 2021
30ab3f3
Update submodule pointer for fv3atm; skip-ci
climbfuji Jan 21, 2021
fcb9550
Revert change to .gitmodules for stochastic_physics, update submodule…
climbfuji Jan 21, 2021
7577fb5
Update submodule pointer for fv3atm; skip-ci
climbfuji Jan 21, 2021
c7d8587
Regression tests round 2 for all tier-1 platforms except wcoss_cray a…
climbfuji Jan 21, 2021
025424a
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jan 22, 2021
2dcb64d
Regression test logs for wcoss_cray
climbfuji Jan 22, 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-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-GSL/fv3atm
#branch = gsl/develop
url = https://github.com/climbfuji/fv3atm
branch = update_develop_from_gsl_develop
[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-psd/stochastic_physics
branch = master
#url = https://github.com/noaa-gsl/stochastic_physics
#branch = gsl/develop
url = https://github.com/climbfuji/stochastic_physics
branch = update_master_from_noaa_gsl
[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 19 files
+12 −6 .gitmodules
+1 −1 atmos_cubed_sphere
+4 −5 atmos_model.F90
+0 −2 ccpp/config/ccpp_prebuild_config.py
+85 −62 ccpp/data/GFS_typedefs.F90
+59 −21 ccpp/data/GFS_typedefs.meta
+6 −6 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+0 −3 ccpp/suites/suite_FV3_GSD_SAR.xml
+0 −1 ccpp/suites/suite_FV3_GSD_noah.xml
+0 −4 ccpp/suites/suite_FV3_GSD_v0.xml
+0 −3 ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
+0 −3 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+0 −3 ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+0 −3 ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml
+0 −3 ccpp/suites/suite_FV3_HRRR.xml
+0 −3 ccpp/suites/suite_FV3_RAP.xml
+54 −31 io/FV3GFS_io.F90
+103 −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
+159 −64 lndp_apply_perts.F90
2 changes: 2 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ export DO_MYNNSFCLAY=.F.
export LSM=1
export LSOIL_LSM=4
export LANDICE=.T.
export KICE=2

# Ozone / stratospheric H2O
export OZ_PHYS_OLD=.T.
Expand Down Expand Up @@ -386,6 +387,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
4 changes: 4 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,8 +174,10 @@
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]
iopt_dveg = 2
iopt_crs = 1
iopt_btr = 1
Expand Down Expand Up @@ -324,6 +326,8 @@
LNDP_TAU=21600,
LNDP_LSCALE=500000,
ISEED_LNDP=2010,
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
3 changes: 3 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 @@ -199,6 +199,7 @@
lsm = 3
lsoil = 9
lsoil_lsm = 9
kice = 9
iopt_dveg = 2
iopt_crs = 1
iopt_btr = 1
Expand Down Expand Up @@ -276,6 +277,7 @@
FABSL = 99999,
FSNOS = 99999,
FSICS = 99999,
/

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

&nam_sfcperts
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
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
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
fi

if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210115/${RT_COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210120/${RT_COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210115}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210120}
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210115}
Expand Down
4 changes: 4 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 All @@ -9,7 +11,9 @@ RUN | fv3_ccpp_gf_thompson
RUN | fv3_ccpp_gsd | | fv3 |
RUN | fv3_ccpp_gsd_coldstart | | |
RUN | fv3_ccpp_gsd_warmstart | | | fv3_ccpp_gsd_coldstart
RUN | fv3_ccpp_gsd_lndp | | fv3 |
RUN | fv3_ccpp_gsd_noah | | fv3 |
RUN | fv3_ccpp_gsd_noah_lndp | | fv3 |

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

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9

export KICE=9

export WLCLK=30

2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_coldstart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9

export KICE=9
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9

export KICE=9

export WLCLK=30
2 changes: 1 addition & 1 deletion tests/tests/fv3_ccpp_gsd_diag3d_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9

export KICE=9

export WLCLK=30

1 change: 1 addition & 0 deletions tests/tests/fv3_ccpp_gsd_drag_suite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export KICE=9
export GWD_OPT=3
export DO_UGWP_V0=.F.
export DO_UGWP_V0_OROG_ONLY=.F.
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export KICE=9

export GWD_OPT=2
export DO_UGWP_V0=.F.
export DO_UGWP_V0_OROG_ONLY=.F.
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=6
export LNDP_EACH_STEP=.T.

#export WLCLK=30
1 change: 1 addition & 0 deletions tests/tests/fv3_ccpp_gsd_mynnsfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export KICE=9

RUN_SCRIPT=rt_fv3.sh

Expand Down
1 change: 1 addition & 0 deletions tests/tests/fv3_ccpp_gsd_mynnsfc_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export KICE=9

RUN_SCRIPT=rt_fv3.sh

Expand Down
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=6
export LNDP_EACH_STEP=.T.

#export WLCLK=30
Loading