Skip to content

Commit

Permalink
Merge pull request NCAR#13 from climbfuji/mynnsfclay_from_joe_in_late…
Browse files Browse the repository at this point in the history
…st_code

Update to MYNN Surface Layer Scheme
  • Loading branch information
DomHeinzeller authored Apr 3, 2020
2 parents badba27 + c1ab433 commit 8b2cfd8
Show file tree
Hide file tree
Showing 11 changed files with 490 additions and 47 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated from 2a05c5 to 5b6a22
2 changes: 1 addition & 1 deletion parm/ccpp_gsd.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
satmedmf = .false.
lheatstrg = @[LHEATSTRG]
do_mynnedmf = @[DO_MYNNEDMF]
do_mynnsfclay = .false.
do_mynnsfclay = @[DO_MYNNSFCLAY]
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export IMFDEEPCNV=2

# SFC
export DO_MYJSFC=.F.
export DO_MYNNSFCLAY=.F.

# LSM
export LSM=1
Expand Down
4 changes: 2 additions & 2 deletions tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,9 @@ while getopts ":cfsl:mkreh" opt; do
done

if [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/develop-20200115/${COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/develop-20200320/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200115}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200320}
fi

shift $((OPTIND-1))
Expand Down
43 changes: 13 additions & 30 deletions tests/rt_ccpp_gsd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,16 @@ RUN | fv3_ccpp_thompson_mynn
RUN | fv3_ccpp_gf_thompson | standard | | fv3 |
RUN | fv3_ccpp_gsd | standard | | fv3 |
RUN | fv3_ccpp_gsd_coldstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart
RUN | fv3_ccpp_gsd_noah | standard | | fv3 |
# Compile with CCPP - static mode
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_gsd_mynnsfc | standard | | fv3 |
RUN | fv3_ccpp_gsd_noah_mynnsfc | standard | | fv3 |
# Compile with CCPP - static mode
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | cheyenne.gnu | fv3 |
Expand All @@ -25,11 +32,13 @@ RUN | fv3_ccpp_mynn
RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 |
RUN | fv3_ccpp_gsd_sar | standard | | fv3 |
# Compile with CCPP - static mode, debug
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | hera.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 |
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | hera.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_gsd_debug | standard | | fv3 |
RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 |
RUN | fv3_ccpp_gsd_noah_mynnsfc_debug | standard | | fv3 |
# Non-aerosol field_table staged only on hera for the moment
RUN | fv3_ccpp_thompson_no_aero_debug | standard | hera.intel | fv3 |
# Compile with CCPP - static mode, debug, 32bit dynamics
Expand All @@ -38,29 +47,3 @@ COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 |

#############################################################################################################################################################################
# CCPP DYNAMIC tests #
#############################################################################################################################################################################
# Compile with CCPP - dynamic mode
COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | |
COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | |
COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | |
# Run tests
RUN | fv3_ccpp_thompson_mynn | standard | | |
RUN | fv3_ccpp_gf_thompson | standard | | |
RUN | fv3_ccpp_gsd | standard | | |
RUN | fv3_ccpp_gsd_coldstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | |
RUN | fv3_ccpp_gsd_noah | standard | | |
RUN | fv3_ccpp_thompson | standard | | |
RUN | fv3_ccpp_gf | standard | | |
RUN | fv3_ccpp_mynn | standard | | |
RUN | fv3_ccpp_gsd_drag_suite | standard | | |
RUN | fv3_ccpp_gsd_sar | standard | | |
# Do not run debug tests in dynamic mode, these time out because of excessive log statements
## Compile with CCPP - dynamic mode, debug
#COMPILE | CCPP=Y DEBUG=Y | standard | hera.intel | fv3 |
#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.intel | fv3 |
#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.gnu | fv3 |
#RUN | fv3_ccpp_gsd_debug | standard | | |
26 changes: 13 additions & 13 deletions tests/tests/fv3_ccpp_gsd_debug
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ export LIST_FILES="atmos_4xdaily.tile1.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 \
phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.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 \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
Expand Down Expand Up @@ -74,7 +74,7 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \
export_fv3
export NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=24
export FHMAX=6
export FDIAG=3

export DT_ATMOS="600"
Expand Down
128 changes: 128 additions & 0 deletions tests/tests/fv3_ccpp_gsd_mynnsfc
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + MYNN SFC) full (0-48h) test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP GSD + MYNN SFC results with previous trunk version"

export CNTL_DIR=fv3_gsd_mynnsfc

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 \
phyf027.tile1.nc \
phyf027.tile2.nc \
phyf027.tile3.nc \
phyf027.tile4.nc \
phyf027.tile5.nc \
phyf027.tile6.nc \
phyf048.tile1.nc \
phyf048.tile2.nc \
phyf048.tile3.nc \
phyf048.tile4.nc \
phyf048.tile5.nc \
phyf048.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 \
dynf027.tile1.nc \
dynf027.tile2.nc \
dynf027.tile3.nc \
dynf027.tile4.nc \
dynf027.tile5.nc \
dynf027.tile6.nc \
dynf048.tile1.nc \
dynf048.tile2.nc \
dynf048.tile3.nc \
dynf048.tile4.nc \
dynf048.tile5.nc \
dynf048.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 NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=48
export FDIAG=3

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_mynnsfc
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export DO_MYNNSFCLAY=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export FHCYC=0
export LSM=3
export LSOIL_LSM=9

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30

103 changes: 103 additions & 0 deletions tests/tests/fv3_ccpp_gsd_mynnsfc_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
##########################################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + MYNN SFC) 24h test in DEBUG mode
#
##########################################################################################

export TEST_DESCR="Compare FV3 CCPP GSD + MYNN SFC DEBUG results with previous trunk version"

export CNTL_DIR=fv3_gsd_mynnsfc_debug

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 \
phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.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 NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=6
export FDIAG=3

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_mynnsfc
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export DO_MYNNSFCLAY=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export FHCYC=0
export LSM=3
export LSOIL_LSM=9

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30
Loading

0 comments on commit 8b2cfd8

Please sign in to comment.