Skip to content

Commit

Permalink
tests/fv3_conf/ccpp_control_run.IN, tests/rt_ccpp_dtc.conf: bugfixes …
Browse files Browse the repository at this point in the history 
…for new, coupled FV3-WW3 tests
  • Loading branch information
@climbfuji
climbfuji committed Dec 2, 2019
1 parent 080d738 commit f32c931
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
5 changes: 5 additions & 0 deletions tests/fv3_conf/ccpp_control_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ cp @[RTPWD]/${inputdir}/*grb .
cp @[RTPWD]/${inputdir}/*_table .
cp @[RTPWD]/${inputdir}/*configure .

if [ $CPLWAV = .T. ]; then
cp @[RTPWD]/WW3_input_data/mod_def.* .
cp @[RTPWD]/WW3_input_data/@[SYEAR]@[SMONTH]@[SDAY]/ww3_multi.inp .
fi

cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml

# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh
Expand Down
27 changes: 24 additions & 3 deletions tests/rt_ccpp_dtc.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ RUN | fv3_2threads
RUN | fv3_ozphys_2015 | standard | | fv3 |
RUN | fv3_wsm6 | standard | | fv3 |
RUN | fv3_gfdlmp | standard | | fv3 |
RUN | fv3_gfdlmprad | standard | | fv3 |
RUN | fv3_gfdlmprad_gwd | standard | | fv3 |
RUN | fv3_gfdlmprad_noahmp | standard | | fv3 |
RUN | fv3_stochy | standard | | fv3 |
Expand All @@ -35,6 +34,14 @@ RUN | fv3_csawmg3shoc127
RUN | fv3_csawmg3shoc127 | standard | hera.intel | fv3 |
RUN | fv3_csawmg3shoc127 | standard | cheyenne.intel | fv3 |
RUN | fv3_csawmg3shoc127 | standard | jet.intel | fv3 |
# Coupled with WW3
COMPILE | REPRO=Y WW3=Y | standard | gaea.intel | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | hera.intel | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | cheyenne.intel | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | cheyenne.gnu | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | stampede.intel | fv3 |
COMPILE | REPRO=Y WW3=Y | standard | jet.intel | fv3 |
RUN | fv3_gfdlmprad | standard | | fv3 |
# 32-bit dynamics
COMPILE | REPRO=Y 32BIT=Y | standard | gaea.intel | fv3 |
COMPILE | REPRO=Y 32BIT=Y | standard | hera.intel | fv3 |
Expand Down Expand Up @@ -100,9 +107,16 @@ COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | jet.intel | |
# Run tests with static CCPP add-on
RUN | fv3_ccpp_gfdlmp | standard | | |
RUN | fv3_ccpp_gfdlmprad | standard | | |
RUN | fv3_ccpp_gfdlmprad_gwd | standard | | |
RUN | fv3_ccpp_gfdlmprad_noahmp | standard | | |
# Coupled with WW3
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | gaea.intel | |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | hera.intel | |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | cheyenne.intel | |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | cheyenne.gnu | |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | stampede.intel | |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp WW3=Y | standard | jet.intel | |
RUN | fv3_ccpp_gfdlmprad | standard | | |
## csawmg-based tests (Intel only, crashing with GNU and PGI)
#COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc | standard | gaea.intel | |
#COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc | standard | hera.intel | |
Expand Down Expand Up @@ -190,14 +204,21 @@ RUN | fv3_ccpp_decomp
RUN | fv3_ccpp_2threads | standard | | |
RUN | fv3_ccpp_ozphys_2015 | standard | | |
RUN | fv3_ccpp_gfdlmp | standard | | |
RUN | fv3_ccpp_gfdlmprad | standard | | |
RUN | fv3_ccpp_gfdlmprad_gwd | standard | | |
RUN | fv3_ccpp_gfdlmprad_noahmp | standard | | |
RUN | fv3_ccpp_stochy | standard | | |
RUN | fv3_ccpp_satmedmf | standard | | |
RUN | fv3_ccpp_satmedmfq | standard | | |
RUN | fv3_ccpp_lheatstrg | standard | | |
RUN | fv3_ccpp_h2ophys | standard | | |
# Coupled with WW3
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | gaea.intel | |
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | hera.intel | |
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | cheyenne.intel | |
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | cheyenne.gnu | |
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | stampede.intel | |
COMPILE | CCPP=Y REPRO=Y WW3=Y | standard | jet.intel | |
RUN | fv3_ccpp_gfdlmprad | standard | | |
## Note: any suite that uses csawmg crashes with GNU and PGI (--> there must be something wrong with it)
#RUN | fv3_ccpp_csawmgshoc | standard | gaea.intel | |
#RUN | fv3_ccpp_csawmgshoc | standard | hera.intel | |
Expand Down

0 comments on commit f32c931

Please sign in to comment.