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 regression tests from GFSv15+Thompson to GFSv16+Thompson, include "Add one regional regression test in DEBUG mode. (#419)" #421

Merged
merged 10 commits into from
Feb 19, 2021
Merged

Update regression tests from GFSv15+Thompson to GFSv16+Thompson, include "Add one regional regression test in DEBUG mode. (#419)" #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29dac53
Add one regional regression test in DEBUG mode.
RatkoVasic-NOAA Feb 17, 2021
d02819d
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Feb 17, 2021
e22eeed
Update regression tests from GFSv15+Thompson to GFSv16+Thompson
climbfuji Feb 17, 2021
e3df7a9
Combine several COMPILE lines in tests/rt.conf and tests/rt_gnu.conf
climbfuji Feb 17, 2021
aec4fe1
Regression test log for cheyenne.{gnu,intel}; skip-ci
climbfuji Feb 17, 2021
14b70b4
Regression test logs for gaea.intel, hera.gnu, jet.intel; skip-ci
climbfuji Feb 18, 2021
e719ca0
Regression test log for hera.intel; skip-ci
climbfuji Feb 18, 2021
63f79e6
Regression test log for orion.intel; skip-ci
climbfuji Feb 19, 2021
8923e30
Regression test logs for wcoss_cray and wcoss_dell_p3; skip-ci
climbfuji Feb 19, 2021
f3a0b17
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Feb 19, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+1 −1 ccpp/physics
+91 −0 ccpp/suites/suite_FV3_GFS_v16_thompson.xml
401 changes: 342 additions & 59 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

809 changes: 410 additions & 399 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

789 changes: 400 additions & 389 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

401 changes: 342 additions & 59 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

851 changes: 431 additions & 420 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

521 changes: 266 additions & 255 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

851 changes: 431 additions & 420 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

549 changes: 280 additions & 269 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

849 changes: 430 additions & 419 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -343,6 +343,8 @@ export NA_INIT=1
# Radiation
export DO_RRTMGP=.F.
export ICLOUD=0
export IAER=111
export ICLIQ_SW=1
export IOVR=1

# Microphysics
Expand Down
3 changes: 1 addition & 2 deletions tests/fv3_conf/ccpp_gsd_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ if [ $IMP_PHYSICS = 8 ]; then
fi
else
if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
echo "ERROR, no field table configured for Thompson MP without aerosols but with MYNN or SATMEDMF (need TKE)"
exit 1
cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero_tke field_table
else
cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
fi
Expand Down
20 changes: 14 additions & 6 deletions tests/parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@
fhlwr = 3600.
ialb = 1
iems = 1
iaer = 111
iaer = @[IAER]
icliq_sw = @[ICLIQ_SW]
iovr = @[IOVR]
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand All @@ -147,7 +149,8 @@
redrag = .true.
dspheat = .true.
hybedmf = @[HYBEDMF]
satmedmf = .false.
satmedmf = @[SATMEDMF]
isatmedmf = 1
lheatstrg = @[LHEATSTRG]
do_mynnedmf = @[DO_MYNNEDMF]
do_mynnsfclay = @[DO_MYNNSFCLAY]
Expand Down Expand Up @@ -194,7 +197,10 @@
bl_mynn_tkeadvect = .true.
bl_mynn_edmf = 1
bl_mynn_edmf_mom = 1
gwd_opt = @[GWD_OPT]
gwd_opt = @[GWD_OPT]
ldiag_ugwp = @[LDIAG_UGWP]
do_ugwp = @[DO_UGWP]
do_tofd = @[DO_TOFD]
do_ugwp_v0 = @[DO_UGWP_V0]
do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY]
do_gsl_drag_ls_bl = @[DO_GSL_DRAG_LS_BL]
Expand Down Expand Up @@ -300,27 +306,28 @@
FSICS = 99999,
/
&nam_stochy
lon_s=768,
lat_s=384,
ntrunc=382,
SKEBNORM=1,
SKEB_NPASS=30,
SKEB_VDOF=5,
SKEB=@[SKEB],
SKEB_TAU=2.16E4,
SKEB_LSCALE=1000.E3,
SKEBINT=1800,
SHUM=@[SHUM],
SHUM_TAU=21600,
SHUM_LSCALE=500000,
SHUMINT=3600,
SPPT=@[SPPT],
SPPT_TAU=21600,
SPPT_LSCALE=500000,
SPPT_LOGIT=.TRUE.,
SPPT_SFCLIMIT=.TRUE.,
SPPTINT=1800,
ISEED_SHUM=1,
ISEED_SKEB=2,
ISEED_SPPT=3,
/

&nam_sfcperts
lndp_type = @[LNDP_TYPE]
LNDP_TAU=21600,
Expand All @@ -344,3 +351,4 @@
knob_ugwp_version = 0
launch_level = 25
/

13 changes: 6 additions & 7 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ RUN | fv3_ccpp_regional_quilt_netcdf_parallel
#RUN | fv3_ccpp_regional_c768 | jet.intel | fv3 |
#RUN | fv3_ccpp_regional_c768 | orion.intel | fv3 |

COMPILE | SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | | fv3 |
RUN | fv3_ccpp_control_debug | | fv3 |
RUN | fv3_ccpp_stretched_nest_debug | | fv3 |

COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | | fv3 |
RUN | fv3_ccpp_gfdlmp | | fv3 |
RUN | fv3_ccpp_gfdlmprad_gwd | | fv3 |
Expand All @@ -63,7 +59,7 @@ RUN | fv3_ccpp_csawmg
RUN | fv3_ccpp_satmedmf | | fv3 |
RUN | fv3_ccpp_satmedmfq | | fv3 |

COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y | | fv3 |
COMPILE | SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RAP,FV3_HRRR,FV3_RRFS_v1beta 32BIT=Y | | fv3 |
RUN | fv3_ccpp_gfdlmp_32bit | | fv3 |
RUN | fv3_ccpp_gfdlmprad_32bit_post | | fv3 |
RUN | fv3_ccpp_cpt | | fv3 |
Expand Down Expand Up @@ -109,13 +105,16 @@ RUN | fv3_ccpp_gfsv16_ugwpv1_warmstart
# Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
# Note: weird bug on Cheyenne, compiling without SUITES=... works fine on the login nodes, but crashes on the compute nodes; same issues on wcoss_cray and wcoss_dell_p3
COMPILE | DEBUG=Y | - gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
COMPILE | DEBUG=Y SUITES='FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP' | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
COMPILE | DEBUG=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16,FV3_GFS_v16_RRTMGP | + gaea.intel cheyenne.intel wcoss_cray wcoss_dell_p3 | fv3 |
RUN | fv3_ccpp_gfs_v15p2_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16_debug | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP_debug | | fv3 |

COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | | fv3 |
COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_2017,FV3_GFS_2017_stretched,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | | fv3 |
RUN | fv3_ccpp_regional_control_debug | | fv3 |
RUN | fv3_ccpp_control_debug | | fv3 |
RUN | fv3_ccpp_stretched_nest_debug | | fv3 |
RUN | fv3_ccpp_gsd_debug | | fv3 |
RUN | fv3_ccpp_gsd_diag3d_debug | | fv3 |
RUN | fv3_ccpp_thompson_debug | | fv3 |
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 @@ -415,9 +415,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-20210212/${RT_COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217/${RT_COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210212}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210217}
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}
Expand Down
4 changes: 2 additions & 2 deletions tests/rt_ccpp_dev.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COMPILE | REPRO=Y SUITES=FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc
RUN | fv3_ccpp_gsd_mynnsfc | | fv3 |
RUN | fv3_ccpp_gsd_noah_mynnsfc | | fv3 |

COMPILE | REPRO=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR | | fv3 |
COMPILE | REPRO=Y SUITES=FV3_GFS_v16_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_SAR | | fv3 |

RUN | fv3_ccpp_thompson | | fv3 |
RUN | fv3_ccpp_thompson_no_aero | | fv3 |
Expand All @@ -46,7 +46,7 @@ RUN | fv3_ccpp_ntiedtke
# CCPP DEBUG tests #
############################################################################################################################################################

COMPILE | DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | | fv3 |
COMPILE | DEBUG=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v16_thompson | | fv3 |

RUN | fv3_ccpp_gsd_debug | | fv3 |
RUN | fv3_ccpp_gsd_diag3d_debug | | fv3 |
Expand Down
14 changes: 7 additions & 7 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN | fv3_ccpp_gfs_v16_flake
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | | fv3 |
RUN | fv3_ccpp_gfs_v16_RRTMGP | | fv3 |

COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y | | fv3 |
COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y | | fv3 |

RUN | fv3_ccpp_gsd | | fv3 |
RUN | fv3_ccpp_thompson | | fv3 |
Expand Down Expand Up @@ -46,12 +46,12 @@ RUN | fv3_ccpp_gfs_v16_RRTMGP_debug
COMPILE | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y | | fv3 |
RUN | fv3_ccpp_multigases | | fv3 |

COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | | fv3 |
# FIX ME - THESE ARE ALL CRASHING ON HERA WITH GNU 9.2.0 / CHEYENNE WITH GNU 9.1.0
#RUN | fv3_ccpp_rrfs_v1beta_debug | | fv3 |
#RUN | fv3_ccpp_gsd_debug | | fv3 |
#RUN | fv3_ccpp_thompson_debug | | fv3 |
#RUN | fv3_ccpp_thompson_no_aero_debug | | fv3 |
COMPILE | SUITES=FV3_GFS_v15_thompson_mynn,FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | | fv3 |
RUN | fv3_ccpp_regional_control_debug | | fv3 |
RUN | fv3_ccpp_rrfs_v1beta_debug | | fv3 |
RUN | fv3_ccpp_gsd_debug | | fv3 |
RUN | fv3_ccpp_thompson_debug | | fv3 |
RUN | fv3_ccpp_thompson_no_aero_debug | | fv3 |

COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 DEBUG=Y | | fv3 |
RUN | fv3_ccpp_HAFS_v0_hwrf_thompson_debug | | fv3 |
Expand Down
35 changes: 35 additions & 0 deletions tests/tests/fv3_ccpp_regional_control_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
###############################################################################
#
# FV3 CCPP regional control test
#
###############################################################################

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

export CNTL_DIR=fv3_regional_control_debug

export LIST_FILES=" atmos_4xdaily.nc \
fv3_history2d.nc \
fv3_history.nc \
RESTART/fv_core.res.tile1_new.nc \
RESTART/fv_tracer.res.tile1_new.nc"

export_fv3

export TASKS=40
export FHMAX="01"

export FV3_RUN=ccpp_regional_run.IN

export OZ_PHYS_OLD=.F.
export OZ_PHYS_NEW=.T.
export H2O_PHYS=.T.
export HYBEDMF=.F.

export CCPP_SUITE=FV3_GFS_v15_thompson_mynn
export INPUT_NML=ccpp_regional.nml.IN

export FDIAG=1
export INPES=5
export JNPES=8
export WRITE_RESTART_WITH_BCS=.true.
12 changes: 10 additions & 2 deletions tests/tests/fv3_ccpp_thompson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,19 @@ export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GFS_v15_thompson
export CCPP_SUITE=FV3_GFS_v16_thompson
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.T.
export HYBEDMF=.F.
export SATMEDMF=.T.
export DO_MYNNEDMF=.F.

export IMFSHALCNV=2
export IMFDEEPCNV=2

export IAER=5111
export ICLIQ_SW=2
export IOVR=3

export LHEATSTRG=.T.
export DO_TOFD=.T.
12 changes: 10 additions & 2 deletions tests/tests/fv3_ccpp_thompson_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,19 @@ export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GFS_v15_thompson
export CCPP_SUITE=FV3_GFS_v16_thompson
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.T.
export HYBEDMF=.F.
export SATMEDMF=.T.
export DO_MYNNEDMF=.F.

export IMFSHALCNV=2
export IMFDEEPCNV=2

export IAER=5111
export ICLIQ_SW=2
export IOVR=3

export LHEATSTRG=.T.
export DO_TOFD=.T.
12 changes: 10 additions & 2 deletions tests/tests/fv3_ccpp_thompson_no_aero
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,19 @@ export NSRADAR_RESET=3600.0
export LTAEROSOL=.F.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GFS_v15_thompson
export CCPP_SUITE=FV3_GFS_v16_thompson
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.T.
export HYBEDMF=.F.
export SATMEDMF=.T.
export DO_MYNNEDMF=.F.

export IMFSHALCNV=2
export IMFDEEPCNV=2

export IAER=5111
export ICLIQ_SW=2
export IOVR=3

export LHEATSTRG=.T.
export DO_TOFD=.T.
12 changes: 10 additions & 2 deletions tests/tests/fv3_ccpp_thompson_no_aero_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,19 @@ export NSRADAR_RESET=3600.0
export LTAEROSOL=.F.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GFS_v15_thompson
export CCPP_SUITE=FV3_GFS_v16_thompson
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.T.
export HYBEDMF=.F.
export SATMEDMF=.T.
export DO_MYNNEDMF=.F.

export IMFSHALCNV=2
export IMFDEEPCNV=2

export IAER=5111
export ICLIQ_SW=2
export IOVR=3

export LHEATSTRG=.T.
export DO_TOFD=.T.