Skip to content

Commit 9530f06

Browse files
climbfujiclimbfuji
authored
Merge pull request #41 from climbfuji/HAFS_fer_hires_for_dtc_hwrf-physics
dtc/hwrf-physics: HWRF Ferrier-Aligo MP scheme updates
2 parents 06b4aa3 + de91513 commit 9530f06

7 files changed

+120
-10
lines changed

‎FV3

‎tests/rt.conf

+4-4
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,9 @@ RUN | fv3_ccpp_gfdlmprad_32bit_post
253253
RUN | fv3_ccpp_cpt | standard | | |
254254
RUN | fv3_ccpp_gsd | standard | | fv3 |
255255

256-
COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
256+
COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
257257

258-
RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
258+
RUN | fv3_ccpp_regional_c768_FA | standard | hera.intel | fv3 |
259259
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |
260260
RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
261261

@@ -377,9 +377,9 @@ RUN | fv3_ccpp_gsd
377377
RUN | fv3_ccpp_thompson | standard | | fv3 |
378378
RUN | fv3_ccpp_thompson_no_aero | standard | | fv3 |
379379

380-
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
380+
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
381381

382-
RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
382+
RUN | fv3_ccpp_regional_c768_FA | standard | hera.intel | fv3 |
383383
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |
384384
RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 |
385385

‎tests/rt.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,11 @@ done
383383

384384
# Fix me - make those definitions and DISKNM consistent
385385
if [[ $MACHINE_ID = hera.* ]]; then
386-
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200410/${COMPILER^^}}
386+
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415/${COMPILER^^}}
387387
elif [[ $MACHINE_ID = cheyenne.* ]]; then
388-
RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200410/${COMPILER^^}}
388+
RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200415/${COMPILER^^}}
389389
else
390-
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200410}
390+
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200415}
391391
fi
392392

393393
shift $((OPTIND-1))

‎tests/rt_gnu.conf

+14
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ RUN | fv3_gfdlmp
2222
COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp | standard | | |
2323
RUN | fv3_ccpp_gfdlmp | standard | cheyenne.gnu | |
2424

25+
# Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne
26+
#COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | | fv3 |
27+
#
28+
#RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.gnu | fv3 |
29+
#RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.gnu | fv3 |
30+
#RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.gnu | fv3 |
31+
2532
#######################################################################################################################################################################################
2633
# CCPP PROD tests #
2734
#######################################################################################################################################################################################
@@ -37,6 +44,13 @@ COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta
3744
RUN | fv3_ccpp_gfs_v15p2 | standard | cheyenne.gnu | fv3 |
3845
RUN | fv3_ccpp_gfs_v16beta | standard | cheyenne.gnu | fv3 |
3946

47+
# Turn off for now - either running too long or crashing with GNU 9.1.0 on Cheyenne
48+
#COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires,FV3_HAFS_FA_HWRF_RRTMG | standard | | fv3 |
49+
#
50+
#RUN | fv3_ccpp_regional_c768_FA | standard | cheyenne.gnu | fv3 |
51+
#RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | cheyenne.gnu | fv3 |
52+
#RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | cheyenne.gnu | fv3 |
53+
4054
#######################################################################################################################################################################################
4155
# CCPP DEBUG tests #
4256
#######################################################################################################################################################################################

0 commit comments

Comments
 (0)