Skip to content

Commit

Permalink
Merge pull request NOAA-EMC#25 from climbfuji/add_drag_suite_and_othe…
Browse files Browse the repository at this point in the history 
…r_updates

Add drag suite and other updates
  • Loading branch information
@DomHeinzeller
DomHeinzeller authored Jun 5, 2020
2 parents efbcf42 + 5c95cf9 commit 4926839
Show file tree
Hide file tree
Showing 5 changed files with 168 additions and 23 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated from d78e55 to eca86d
5 changes: 5 additions & 0 deletions tests/fv3_conf/ccpp_gsd_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,9 @@ if [ $IMP_PHYSICS = 8 ]; then
cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
fi

if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ]; then
cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_drag_suite/* INPUT/
# USE INSTEAD: cp @[RTPWD]/FV3_input_data_gsd/FV3_input_data_C96_drag_suite/* INPUT/
fi

cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml
47 changes: 29 additions & 18 deletions tests/rt_ccpp_gsd.conf
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,62 @@
#################################################################################################################################################################################
# CCPP STATIC tests #
# CCPP REPRO tests #
#################################################################################################################################################################################
# Compile with CCPP - static mode

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 |
# Run tests

RUN | fv3_ccpp_thompson_mynn | standard | | fv3 |
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 | | | fv3_ccpp_gsd_coldstart
RUN | fv3_ccpp_gsd_noah | standard | | fv3 |
# Compile with CCPP - static mode

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=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 SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 |
# Run tests

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR | standard | cheyenne.gnu | fv3 |

RUN | fv3_ccpp_thompson | standard | | fv3 |
# Non-aerosol field_table staged only on hera for the moment
RUN | fv3_ccpp_thompson_no_aero | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gf | standard | | fv3 |
RUN | fv3_ccpp_mynn | standard | | fv3 |
RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 |
RUN | fv3_ccpp_gsd_sar | standard | | fv3 |
RUN | fv3_ccpp_raphrrr | standard | | fv3 |
# Compile with CCPP - static mode, debug

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite,FV3_RAP,FV3_HRRR | standard | cheyenne.gnu | fv3 |

# Orographic data for drag suite (used by all three tests) staged only on hera for the moment
RUN | fv3_ccpp_gsd_drag_suite | standard | hera.intel | fv3 |
RUN | fv3_ccpp_rap | standard | hera.intel | fv3 |
RUN | fv3_ccpp_hrrr | standard | hera.intel | fv3 |

#################################################################################################################################################################################
# CCPP DEBUG tests #
#################################################################################################################################################################################

COMPILE | CCPP=Y DEBUG=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 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 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_diag3d_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
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAPHRRR | standard | cheyenne.gnu | fv3 |

COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAP,FV3_HRRR | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAP,FV3_HRRR | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y DEBUG=Y SUITES=FV3_GSD_SAR,FV3_RAP,FV3_HRRR | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 |
8 changes: 4 additions & 4 deletions tests/tests/fv3_ccpp_raphrrr → tests/tests/fv3_ccpp_hrrr
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
###############################################################################
#
# FV3 CCPP RAP/HRRR (Thompson MP + MYNN SFC/PBL + RUC LSM + GSD drag suite) full (0-48h) test
# FV3 CCPP HRRR (Thompson MP + MYNN SFC/PBL + RUC LSM + GSD drag suite) full (0-48h) test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP RAP/HRRR results with previous trunk version"
export TEST_DESCR="Compare FV3 CCPP HRRR results with previous trunk version"

export CNTL_DIR=fv3_gsd_raphrrr
export CNTL_DIR=fv3_hrrr

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
Expand Down Expand Up @@ -109,7 +109,7 @@ export LRADAR=.T.
export LTAEROSOL=.T.

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

Expand Down
129 changes: 129 additions & 0 deletions tests/tests/fv3_ccpp_rap
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
###############################################################################
#
# FV3 CCPP RAP (Thompson MP + MYNN SFC/PBL + GF CU + RUC LSM + GSD drag suite) full (0-48h) test
#
###############################################################################

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

export CNTL_DIR=fv3_rap

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_RAP
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
export GWD_OPT=3

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30

0 comments on commit 4926839

Please sign in to comment.