Skip to content
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

dtc/hwrf-physics: HWRF Ferrier-Aligo MP scheme updates #41

Merged
merged 7 commits into from
Apr 16, 2020
Merged

dtc/hwrf-physics: HWRF Ferrier-Aligo MP scheme updates #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af14505
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 14, 2020
fa355b9
make FA test name concise
mzhangw Nov 25, 2019
c58fb57
tests/rt.conf: rename regression test fv3_ccpp_regional_c768_FA_updat…
climbfuji Apr 14, 2020
05b564a
Missing updates for various regression test files as a result of the …
climbfuji Apr 15, 2020
032de19
Turn off FA tests for GNU, currently either running out of time or cr…
climbfuji Apr 15, 2020
340cdec
Remove RRMTGP tests from tests/rt_intel.conf, these were copied over …
climbfuji Apr 15, 2020
de91513
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 16, 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 2 files
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_HAFS_ferhires.xml
8 changes: 4 additions & 4 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down Expand Up @@ -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 |

Expand Down
6 changes: 3 additions & 3 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
14 changes: 14 additions & 0 deletions tests/rt_gnu.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
#######################################################################################################################################################################################
Expand All @@ -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 #
#######################################################################################################################################################################################
Expand Down
Loading