From af14505fdda9c5188e2c82b6389b8dfac19d79d8 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 14 Apr 2020 14:57:23 -0600 Subject: [PATCH 1/7] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 6 ++++-- FV3 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index e1ca6efa77..1cdbabbdd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,9 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NCAR/fv3atm - branch = dtc/hwrf-physics + #url = https://github.com/NCAR/fv3atm + #branch = dtc/hwrf-physics + url = https://github.com/climbfuji/fv3atm + branch = HAFS_fer_hires_for_dtc_hwrf-physics [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 9e44026039..0aeeaad1db 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9e44026039e951e90519f67e00d569986e280a4e +Subproject commit 0aeeaad1dbfb76fac37db66adb63d867f127290c From fa355b9a4fccb603e5142c939309f10fba84ae34 Mon Sep 17 00:00:00 2001 From: "Man.Zhang" Date: Mon, 25 Nov 2019 11:31:40 -0700 Subject: [PATCH 2/7] make FA test name concise --- ..._regional_c768_FA_update_moist => fv3_ccpp_regional_c768_FA} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/tests/{fv3_ccpp_regional_c768_FA_update_moist => fv3_ccpp_regional_c768_FA} (93%) 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. From c58fb57e8bb120d35ef4d6d1099195cc1321f601 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 14 Apr 2020 15:00:48 -0600 Subject: [PATCH 3/7] tests/rt.conf: rename regression test fv3_ccpp_regional_c768_FA_update_moist to fv3_ccpp_regional_c768_FA --- tests/rt.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/rt.conf b/tests/rt.conf index 3d859f8b32..b3d17f4046 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -255,7 +255,7 @@ RUN | fv3_ccpp_gsd COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,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 | @@ -379,7 +379,7 @@ RUN | fv3_ccpp_thompson_no_aero COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,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 | From 05b564a8ce31fae0189e86e8321ba9dbce4d8a2a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Apr 2020 08:24:57 -0600 Subject: [PATCH 4/7] Missing updates for various regression test files as a result of the SDF name change FV3_HAFS_ferhires_update_moist -> FV3_HAFS_ferhires, new rt_intel.conf for Cheyenne, additional tests in rt_gnu.conf --- tests/rt.conf | 4 +- tests/rt.sh | 6 +- tests/rt_gnu.conf | 12 +++ tests/rt_intel.conf | 104 ++++++++++++++++++++ tests/tests/fv3_ccpp_regional_c768_HWRF_PBL | 2 +- 5 files changed, 122 insertions(+), 6 deletions(-) create mode 100644 tests/rt_intel.conf diff --git a/tests/rt.conf b/tests/rt.conf index b3d17f4046..113f59ae97 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -253,7 +253,7 @@ 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 | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 | @@ -377,7 +377,7 @@ 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 | standard | hera.intel | fv3 | RUN | fv3_ccpp_regional_c768_HWRF_PBL | 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..d712d39902 100644 --- a/tests/rt_gnu.conf +++ b/tests/rt_gnu.conf @@ -22,6 +22,12 @@ RUN | fv3_gfdlmp COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | | | RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | | +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 +43,12 @@ 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 | +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..0a526928de --- /dev/null +++ b/tests/rt_intel.conf @@ -0,0 +1,104 @@ +####################################################################################################################################################################################### +# 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 | + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_rrtmgp | standard | cheyenne.intel | fv3 | + +####################################################################################################################################################################################### +# CCPP DEBUG tests # +####################################################################################################################################################################################### + +COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP 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 | +RUN | fv3_ccpp_rrtmgp_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,FV3_GFS_2017_RRTMGP REPRO=Y | standard | cheyenne.intel | fv3 | + +RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.intel | fv3 | +RUN | fv3_ccpp_rrtmgp | 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_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. From 032de194be4e065788e60de127a31ca0fa80b760 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Apr 2020 13:35:11 -0600 Subject: [PATCH 5/7] Turn off FA tests for GNU, currently either running out of time or crashing --- tests/rt_gnu.conf | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf index d712d39902..e447b4b6e4 100644 --- a/tests/rt_gnu.conf +++ b/tests/rt_gnu.conf @@ -22,11 +22,12 @@ RUN | fv3_gfdlmp COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | | | RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | | -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 | +# 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 # @@ -43,11 +44,12 @@ 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 | -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 | +# 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 # From 340cdecfb9beb706a3de1b541d0d9c48e365fa11 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Apr 2020 16:47:47 -0600 Subject: [PATCH 6/7] Remove RRMTGP tests from tests/rt_intel.conf, these were copied over by mistake --- tests/rt_intel.conf | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/rt_intel.conf b/tests/rt_intel.conf index 0a526928de..46c7e48ef4 100644 --- a/tests/rt_intel.conf +++ b/tests/rt_intel.conf @@ -65,21 +65,14 @@ RUN | fv3_ccpp_regional_c768_FA RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.intel | fv3 | RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP | standard | cheyenne.intel | fv3 | - -RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.intel | fv3 | -RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.intel | fv3 | -RUN | fv3_ccpp_rrtmgp | standard | cheyenne.intel | fv3 | - ####################################################################################################################################################################################### # CCPP DEBUG tests # ####################################################################################################################################################################################### -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP DEBUG=Y | standard | cheyenne.intel | fv3 | +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 | -RUN | fv3_ccpp_rrtmgp_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 | @@ -91,11 +84,10 @@ RUN | fv3_ccpp_thompson_no_aero_debug # CCPP REPRO tests # ####################################################################################################################################################################################### -COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_2017_RRTMGP REPRO=Y | standard | cheyenne.intel | fv3 | +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 | -RUN | fv3_ccpp_rrtmgp | standard | cheyenne.intel | fv3 | COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | cheyenne.intel | fv3 | From de915136c673ba3b54b356e29d155f6c8cc98d35 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 16 Apr 2020 09:33:19 -0600 Subject: [PATCH 7/7] Revert change to .gitmodules and update submodule pointer for fv3atm --- .gitmodules | 6 ++---- FV3 | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1cdbabbdd3..e1ca6efa77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,7 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NCAR/fv3atm - #branch = dtc/hwrf-physics - url = https://github.com/climbfuji/fv3atm - branch = HAFS_fer_hires_for_dtc_hwrf-physics + url = https://github.com/NCAR/fv3atm + branch = dtc/hwrf-physics [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS diff --git a/FV3 b/FV3 index 0aeeaad1db..fd9afd726d 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 0aeeaad1dbfb76fac37db66adb63d867f127290c +Subproject commit fd9afd726d00aa64ece3f5b2de8d66a1dd28d03b