diff --git a/FV3 b/FV3 index 9e44026039..fd9afd726d 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9e44026039e951e90519f67e00d569986e280a4e +Subproject commit fd9afd726d00aa64ece3f5b2de8d66a1dd28d03b diff --git a/tests/rt.conf b/tests/rt.conf index 3d859f8b32..113f59ae97 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -253,9 +253,9 @@ RUN | fv3_ccpp_gfdlmprad_32bit_post RUN | fv3_ccpp_cpt | standard | | | RUN | fv3_ccpp_gsd | standard | | fv3 | -COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 | +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 | -RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 | +RUN | fv3_ccpp_regional_c768_FA | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 | @@ -377,9 +377,9 @@ RUN | fv3_ccpp_gsd RUN | fv3_ccpp_thompson | standard | | fv3 | RUN | fv3_ccpp_thompson_no_aero | standard | | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 | +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 | -RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 | +RUN | fv3_ccpp_regional_c768_FA | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 | diff --git a/tests/rt.sh b/tests/rt.sh index f376570ff8..2f390bf0c3 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -383,11 +383,11 @@ done # Fix me - make those definitions and DISKNM consistent if [[ $MACHINE_ID = hera.* ]]; then - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200410/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415/${COMPILER^^}} elif [[ $MACHINE_ID = cheyenne.* ]]; then - RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200410/${COMPILER^^}} + RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200415/${COMPILER^^}} else - RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200410} + RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415} fi shift $((OPTIND-1)) diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf index 81951f6337..e447b4b6e4 100644 --- a/tests/rt_gnu.conf +++ b/tests/rt_gnu.conf @@ -22,6 +22,13 @@ RUN | fv3_gfdlmp COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | | | RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | | +# Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne +#COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | | fv3 | +# +#RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.gnu | fv3 | +#RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.gnu | fv3 | +#RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.gnu | fv3 | + ####################################################################################################################################################################################### # CCPP PROD tests # ####################################################################################################################################################################################### @@ -37,6 +44,13 @@ COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.gnu | fv3 | RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.gnu | fv3 | +# Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne +#COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | | fv3 | +# +#RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.gnu | fv3 | +#RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.gnu | fv3 | +#RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.gnu | fv3 | + ####################################################################################################################################################################################### # CCPP DEBUG tests # ####################################################################################################################################################################################### diff --git a/tests/rt_intel.conf b/tests/rt_intel.conf new file mode 100644 index 0000000000..46c7e48ef4 --- /dev/null +++ b/tests/rt_intel.conf @@ -0,0 +1,96 @@ +####################################################################################################################################################################################### +# CCPP PROD tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_control | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_decomp | standard | cheyenne.intel | | +RUN | fv3_ccpp_2threads | standard | cheyenne.intel | | +RUN | fv3_ccpp_restart | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_read_inc | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_wrtGauss_netcdf_esmf | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_wrtGauss_netcdf | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_wrtGauss_nemsio | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_wrtGauss_nemsio_c192 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_stochy | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_iau | standard | cheyenne.intel | fv3 | + +# WW3 not yet working on Cheyenne +#COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | cheyenne.intel | fv3 | +#RUN | fv3_ccpp_gfdlmprad | standard | cheyenne.intel | fv3 | +#RUN | fv3_ccpp_wrtGauss_nemsio_c768 | standard | cheyenne.intel | fv3 | + +# Run one test using the NEMSAppBuilder, to ensure we don't break it: +APPBUILD| CCPP | standard | cheyenne.intel | | +RUN | fv3_ccpp_appbuild | standard | cheyenne.intel | | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_control_32bit | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_stretched | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_stretched_nest | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp_regional,FV3_GFS_2017_gfdlmp_regional_c768 32BIT=Y | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_control | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_restart | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_quilt | standard | cheyenne.intel | fv3 | +# fv3_regional_c768 not working on Cheyenne, code aborts with invalid values +# for surface pressure, out of range warnings and all other sorts of errors +#RUN | fv3_ccpp_regional_c768 | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_stretched 32BIT=Y DEBUG=Y | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_control_debug | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_stretched_nest_debug | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfdlmp | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfdlmprad_gwd | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfdlmprad_noahmp | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3_GFS_2017_satmedmf | standard | cheyenne.intel | fv3 | +#RUN | fv3_ccpp_csawmgshoc | standard | cheyenne.intel | fv3 | +#RUN | fv3_ccpp_csawmg3shoc127 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_csawmg | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_satmedmf | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfdlmp_32bit | standard | cheyenne.intel | fv3 | +# inline post not yet working on Cheyenne +#RUN | fv3_ccpp_gfdlmprad_32bit_post | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_cpt | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gsd | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | + +####################################################################################################################################################################################### +# CCPP DEBUG tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2_debug | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta_debug | standard | cheyenne.intel | fv3 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_gsd_debug | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_thompson_debug | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_thompson_no_aero_debug | standard | cheyenne.intel | fv3 | + +####################################################################################################################################################################################### +# CCPP REPRO tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta REPRO=Y | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.intel | fv3 | + +COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | diff --git a/tests/tests/fv3_ccpp_regional_c768_FA_update_moist b/tests/tests/fv3_ccpp_regional_c768_FA similarity index 93% rename from tests/tests/fv3_ccpp_regional_c768_FA_update_moist rename to tests/tests/fv3_ccpp_regional_c768_FA index a6cca9b942..3accf32fa2 100644 --- a/tests/tests/fv3_ccpp_regional_c768_FA_update_moist +++ b/tests/tests/fv3_ccpp_regional_c768_FA @@ -20,7 +20,7 @@ export WLCLK=30 export RUN_SCRIPT=rt_fv3.sh export FV3_RUN=ccpp_regional_FA_run.IN -export CCPP_SUITE=FV3_HAFS_ferhires_update_moist +export CCPP_SUITE=FV3_HAFS_ferhires export CCPP_LIB_DIR=ccpp/lib export INPUT_NML=ccpp_regional_c768_FA.nml.IN export LRADAR=.T. diff --git a/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL b/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL index 5a0b91ee01..06746895ee 100644 --- a/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL +++ b/tests/tests/fv3_ccpp_regional_c768_HWRF_PBL @@ -20,7 +20,7 @@ export WLCLK=30 export RUN_SCRIPT=rt_fv3.sh export FV3_RUN=ccpp_regional_FA_run.IN -export CCPP_SUITE=FV3_HAFS_ferhires_update_moist +export CCPP_SUITE=FV3_HAFS_ferhires export CCPP_LIB_DIR=ccpp/lib export INPUT_NML=ccpp_regional_c768_FA.nml.IN export LRADAR=.T.