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

Add no_nsst regression tests #61

Merged
merged 8 commits into from
Feb 20, 2020
Merged

Add no_nsst regression tests #61

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1dafe4
Add no_nsst tests
climbfuji Feb 19, 2020
5c71b5a
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Feb 19, 2020
82492f9
Bugfixes for regression tests, update date tag in rt.sh
climbfuji Feb 19, 2020
9bfec99
Regression test logs for cheyenne.intel
climbfuji Feb 19, 2020
ff3f89c
Bugfix for GNU compilers: wrap CCPP suite name in quotes
climbfuji Feb 19, 2020
aa82f5d
Regression test logs for cheyenne.gnu
climbfuji Feb 19, 2020
823c025
Regression test logs for hera.intel
climbfuji Feb 19, 2020
1e5d7cc
Revert change to .gitmodules, update submodule pointer for FV3
climbfuji Feb 20, 2020
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = release/public-v1
url = https://github.com/climbfuji/fv3atm
branch = add_no_nst_suites_dom
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+92 −0 ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
+92 −0 ccpp/suites/suite_FV3_GFS_v16beta_no_nsst.xml
28 changes: 19 additions & 9 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,44 @@
# CCPP PROD tests #
#######################################################################################################################################################################################

COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta | standard | cheyenne.gnu | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst | standard | cheyenne.gnu | fv3 |

RUN | fv3_ccpp_gfs_v15p2 | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_coldstart | standard | | |
RUN | fv3_ccpp_gfs_v15p2_restart | standard | | | fv3_ccpp_gfs_v15p2_coldstart
RUN | fv3_ccpp_gfs_v15p2_no_nsst | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_coldstart | standard | | |
RUN | fv3_ccpp_gfs_v16beta_restart | standard | | | fv3_ccpp_gfs_v16beta_coldstart
RUN | fv3_ccpp_gfs_v16beta_no_nsst | standard | | fv3 |

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

COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | cheyenne.gnu | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst DEBUG=Y | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst DEBUG=Y | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst DEBUG=Y | standard | cheyenne.gnu | fv3 |

RUN | fv3_ccpp_gfs_v15p2_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_no_nsst_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_no_nsst_debug | standard | | fv3 |

#######################################################################################################################################################################################
# CCPP REPRO tests #
#######################################################################################################################################################################################

COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y | standard | cheyenne.gnu | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst REPRO=Y | standard | hera.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst REPRO=Y | standard | cheyenne.intel | fv3 |
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst REPRO=Y | standard | cheyenne.gnu | fv3 |

RUN | fv3_ccpp_gfs_v15p2 | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_no_nsst | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_no_nsst | standard | | fv3 |

#######################################################################################################################################################################################
# IPD REPRO tests (using Intel compiler only) #
Expand All @@ -44,5 +50,9 @@ COMPILE | 32BIT=Y REPRO=Y

RUN | fv3_gfs_v15p2 | standard | hera.intel | |
RUN | fv3_gfs_v15p2 | standard | cheyenne.intel | |
RUN | fv3_gfs_v15p2_no_nsst | standard | hera.intel | |
RUN | fv3_gfs_v15p2_no_nsst | standard | cheyenne.intel | |
RUN | fv3_gfs_v16beta | standard | hera.intel | |
RUN | fv3_gfs_v16beta | standard | cheyenne.intel | |
RUN | fv3_gfs_v16beta_no_nsst | standard | hera.intel | |
RUN | fv3_gfs_v16beta_no_nsst | standard | cheyenne.intel | |
113 changes: 113 additions & 0 deletions tests/tests/fv3_ccpp_gfs_v15p2_no_nsst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
###############################################################################
#
# FV3 CCPP GFS v15.2 compiled with 32-bit dynamics full (0-48h) test
#
###############################################################################

export TEST_DESCR="Compare FV3 32bit CCPP GFS v15.2 results with previous trunk version"

export CNTL_DIR=fv3_gfs_v15p2_no_nsst

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/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 \
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"


export_fv3
export NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=48
export FDIAG=3

export NSTF_NAME=0,0,0,0,0

DT_ATMOS="1200"

export FV3_RUN=gfs_v15_run.IN
export CCPP_SUITE=FV3_GFS_v15p2_no_nsst
export INPUT_NML=ccpp_v15p2_c96.nml.IN

RUN_SCRIPT=rt_fv3.sh
86 changes: 86 additions & 0 deletions tests/tests/fv3_ccpp_gfs_v15p2_no_nsst_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
###############################################################################
#
# FV3 CCPP GFS v15.2 compiled with 32-bit dynamics test in DEBUG mode
#
###############################################################################

export TEST_DESCR="Run FV3 32bit CCPP GFS v15.2 in DEBUG mode"

export CNTL_DIR=fv3_gfs_v15p2_no_nsst_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="06"
DT_ATMOS="1200"

export NSTF_NAME=0,0,0,0,0

export FV3_RUN=gfs_v15_run.IN
export CCPP_SUITE=FV3_GFS_v15p2_no_nsst
export INPUT_NML=ccpp_v15p2_c96.nml.IN

RUN_SCRIPT=rt_fv3.sh
Loading