Skip to content

Changes to regression test files for recent changes to RRTMG and RRTMGP. #262

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

Merged
DusanJovic-NOAA merged 22 commits into from
Nov 13, 2020
Merged

Changes to regression test files for recent changes to RRTMG and RRTMGP. #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f978e9d
Changes to regression test files for recent changes to RRTMG and RRTMGP.
dustinswales Oct 30, 2020
00adc4a
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Nov 5, 2020
656b9c6
Synced with upstream
dustinswales Nov 6, 2020
728fb71
Updated .gitmodules.
dustinswales Nov 6, 2020
59ccbba
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
dustinswales Nov 9, 2020
5f2d742
Removed redundant importing of kind_phys in physics
dustinswales Nov 10, 2020
61eff43
Apply patch from Dom
dustinswales Nov 10, 2020
ec1fee4
add units to index_for_diagnostic_printout metadata
dustinswales Nov 10, 2020
b2bdc41
Fix submodule pointers for CMEPS and NEMS
climbfuji Nov 11, 2020
aa24555
Replace iovr_{lw,sw} with iovr for HWRF regression tests
climbfuji Nov 11, 2020
f733094
Regression test logs for orion.intel
climbfuji Nov 12, 2020
c5a11dc
Merge pull request #8 from climbfuji/ufs-weather-model-rrtmgp-bugfixe…
dustinswales Nov 12, 2020
f290cc8
Bugfix in GP sampling routines.
dustinswales Nov 12, 2020
9199ed4
Merge branch 'ufs-develop-00a51e1' of https://github.com/dustinswales…
dustinswales Nov 12, 2020
f0d3736
Increase number of nodes for test fv3_ccpp_gocart_clm on Cheyenne
climbfuji Nov 13, 2020
ad1af47
Regression test logs for cheyenne.gnu, cheyenne.intel, orion.intel, w…
climbfuji Nov 13, 2020
d564f22
Regression test log for hera.gnu
climbfuji Nov 13, 2020
2d3a9c0
Regression test log for hera.intel
climbfuji Nov 13, 2020
409abc8
Merge pull request #9 from climbfuji/regtest_logs_rrtmgp
dustinswales Nov 13, 2020
db61b51
Revert submodule pointer for ccpp-physics. Revert FV3 .gitmodules.
dustinswales Nov 13, 2020
0474acb
Merge branch 'ufs-develop-00a51e1' of https://github.com/dustinswales…
dustinswales Nov 13, 2020
c077a7c
Revert submodule pointer for FV3. Revert UFS .gitmodules.
dustinswales Nov 13, 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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 5530a8 to 3bd966
390 changes: 331 additions & 59 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

722 changes: 497 additions & 225 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

702 changes: 487 additions & 215 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

198 changes: 99 additions & 99 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 133 additions & 133 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,7 @@ export NA_INIT=1
# Radiation
export DO_RRTMGP=.F.
export ICLOUD=0
export IOVR_LW=1
export IOVR_SW=1
export IOVR=1

# Microphysics
export IMP_PHYSICS=11
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_c96_HAFS_v0_hwrf_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ cp @[RTPWD]/FV3_input_data_hafs/VEGPARM.TBL .
if [ $IMP_PHYSICS = 8 ]; then
cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_noah diag_table
elif [ $IMP_PHYSICS = 15 ]; then
if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
if [ $IOVR = 4 ]; then
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
else
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table
Expand Down
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_esg_HAFS_v0_hwrf_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi
if [ $IMP_PHYSICS = 8 ]; then
ln -sf diag_table.thompson diag_table
elif [ $IMP_PHYSICS = 15 ]; then
if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
if [ $IOVR = 4 ]; then
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
else
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ccpp_c96_HAFS_v0_hwrf.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@
ltaerosol = @[LTAEROSOL] ! HWRF Thompson
effr_in = @[EFFR_IN] ! HWRF Thompson
icloud = 3 ! HWRF RRTMG
iovr_lw = 4 ! HWRF RRTMG
iovr_sw = 4 ! HWRF RRTMG
iovr = 4 ! HWRF RRTMG
hwrf_samfdeep = .true. ! HWRF SASdeep
hwrf_samfshal = .true. ! HWRF SASshal
asolfac_deep = 0.89 ! HWRF SASdeep; GFS SAS:0.958
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ccpp_esg_HAFS_v0_hwrf.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@
ltaerosol = @[LTAEROSOL] ! HWRF Thompson
effr_in = @[EFFR_IN] ! HWRF Thompson
icloud = 3 ! HWRF RRTMG
iovr_lw = 4 ! HWRF RRTMG
iovr_sw = 4 ! HWRF RRTMG
iovr = 4 ! HWRF RRTMG
hwrf_samfdeep = .true. ! HWRF SASdeep
hwrf_samfshal = .true. ! HWRF SASshal
asolfac_deep = 0.89 ! HWRF SASdeep; GFS SAS:0.958
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ccpp_v16beta_c96.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ deflate_level=1
iems = 1
iaer = 5111
icliq_sw = 2
iovr_lw = 3
iovr_sw = 3
iovr = 3
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ccpp_v16beta_c96_rrtmgp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ deflate_level=1
iems = 1
iaer = 5111
icliq_sw = 2
iovr_lw = 3
iovr_sw = 3
iovr = 3
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/ccpp_v16beta_flake_c96.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ deflate_level=1
iems = 1
iaer = 5111
icliq_sw = 2
iovr_lw = 3
iovr_sw = 3
iovr = 3
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/input.benchmark.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@
iems = 1
iaer = 111
icliq_sw = 1
iovr_lw = 1
iovr_sw = 1
iovr = 1
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/input.benchmark_ccpp.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@
iems = 1
iaer = 111
icliq_sw = 1
iovr_lw = 1
iovr_sw = 1
iovr = 1
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
3 changes: 1 addition & 2 deletions tests/parm/v16beta_c96.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ deflate_level=1
iems = 1
iaer = 5111
icliq_sw = 2
iovr_lw = 3
iovr_sw = 3
iovr = 3
ico2 = 2
isubc_sw = 2
isubc_lw = 2
Expand Down
24 changes: 12 additions & 12 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ RUN | fv3_ccpp_gfs_v15p2
RUN | fv3_ccpp_gfs_v16beta | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | hera.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | orion.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | cheyenne.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | hera.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | orion.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | cheyenne.intel | fv3 |

COMPILE | CCPP=Y SUITES=FV3_GFS_v16_csawmg | standard | | fv3 |
# fv3_ccpp_gfsv16_csawmg and fv3_ccpp_gfsv16_csawmgt crash with a "bus error" on cheyenne.intel, turn off
Expand Down Expand Up @@ -155,12 +155,12 @@ RUN | fv3_ccpp_gfs_v15p2_debug
RUN | fv3_ccpp_gfs_v16beta_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | cheyenne.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | hera.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | orion.intel | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | cheyenne.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | hera.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | orion.intel | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | cheyenne.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | orion.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | cheyenne.intel | fv3 |

COMPILE | CCPP=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson,FV3_RRFS_v1beta 32BIT=Y DEBUG=Y | standard | | fv3 |
RUN | fv3_ccpp_gsd_debug | standard | | 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 @@ -400,9 +400,9 @@ if [[ $SINGLE_NAME != '' ]]; then
fi

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

shift $((OPTIND-1))
Expand Down
8 changes: 4 additions & 4 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v16beta_flake,FV3_
RUN | fv3_ccpp_gfs_v15p2 | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_flake | standard | | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP | standard | | fv3 |

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

Expand All @@ -36,8 +36,8 @@ RUN | fv3_ccpp_control_debug
COMPILE | CCPP=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16beta_RRTMGP DEBUG=Y | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | | fv3 |
#RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | | fv3 |
#RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v15p2_RRTMGP_debug | standard | | fv3 |
RUN | fv3_ccpp_gfs_v16beta_RRTMGP_debug | standard | | fv3 |

COMPILE | CCPP=Y SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y | standard | | fv3 |
RUN | fv3_ccpp_multigases | standard | | fv3 |
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_HAFS_v0_hwrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_HAFS_v0_hwrf_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_HAFS_v0_hwrf_thompson_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ export MONINQFAC=-1.0

#HWRF options for RRTMG
export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4
export IOVR=4

#HWRF NOAH LSM
export LSM=4
Expand Down
5 changes: 5 additions & 0 deletions tests/tests/fv3_ccpp_gocart_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,8 @@ export CCPP_SUITE=FV3_GFS_2017_gfdlmp
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp.gocart.nml.IN

# Increase the number of nodes on Cheyenne to avoid out of memory errors
if [[ $MACHINE_ID = cheyenne.* ]]; then
# Use 30 instead of 36 tasks per node
export TPN=30
fi