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

Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T #304

Merged
merged 9 commits into from
Dec 2, 2020
Merged

Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T #304

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bcd4e9b
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Nov 30, 2020
c97a6f1
Update modulefiles/jet.intel/fv3 to use hpc-stack v1.1.0 pre-release
climbfuji Nov 30, 2020
cae4742
Update of tests/rt.sh for jet.intel and gaea.intel
climbfuji Nov 30, 2020
2f2b553
Enable parallel netCDF and turn off test fv3_ccpp_rrfs_v1beta on jet.…
climbfuji Dec 1, 2020
dc6348c
Update regression test baseline date tag to 20201201; skip-ci
climbfuji Dec 1, 2020
1f6d79d
Also append RT_COMPILER to new baseline directory for gaea; skip-ci
climbfuji Dec 1, 2020
fd98fbd
tests/rt_utils.sh: add jet to list of machines for ALT CHECK
climbfuji Dec 1, 2020
3d3fcf2
Regression test logs for all tier-1 platforms
climbfuji Dec 2, 2020
6b4168f
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Dec 2, 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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/shansun6/fv3atm
branch = frac_rst_gfdl_20201130
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from a898cc to 2fd1b2
72 changes: 31 additions & 41 deletions modulefiles/jet.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,43 @@
#%Module######################################################################
##
## nems prerequisites
##
#%Module

proc ModulesHelp {} {
puts stderr "The prerequisites for compiling or running FV3 on Jet/Intel"
puts stderr "\tcit - loads modules required for building and running UFS Model on Jet/Intel"
}

module purge
module-whatis "loads UFS Model prerequisites for Jet/Intel"

##
## load contrib environment
## load slurm utils (arbitrary.pl layout.pl)
##
module use -a /contrib/sutils/modulefiles
module use /contrib/sutils/modulefiles
module load sutils

module load intel/18.0.5.274
module load impi/2018.4.274

##
## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
##
module use -a /lfs4/HFIP/hfv3gfs/software/ufs-stack-20200909/intel-18.0.5.274/impi-2018.4.274/modules

module load libpng/1.6.35
module load netcdf/4.7.4
module load esmf/8.1.0bs27

module load bacio/2.4.0
module load crtm/2.3.0
module load g2/3.4.0
module load g2tmpl/1.9.0
module load ip/3.3.0
module load nceppost/dceca26
module load nemsio/2.5.1
module load sp/2.3.0
module load w3emc/2.7.0
module load w3nco/2.4.0

module load gfsio/1.4.0
module load sfcio/1.4.0
module load sigio/2.3.0

##
## load cmake
##
module load cmake/3.16.1
setenv CMAKE_C_COMPILER mpiicc
setenv CMAKE_CXX_COMPILER mpiicpc
setenv CMAKE_Fortran_COMPILER mpiifort
setenv CMAKE_Platform jet.intel

module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack

# At this time (2020/11/30), this is the pre-release version 1.0.0
module load hpc/1.1.0
module load hpc-intel/18.0.5.274
module load hpc-impi/2018.4.274

module load jasper/2.0.22
module load zlib/1.2.11
module load png/1.6.35

module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.0
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 @@ -318,7 +318,7 @@ mkdir -p ${STMP}/${USER}

# Different own baseline directories for different compilers on Theia/Cheyenne
NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = jet.* ]]; then
NEW_BASELINE=${NEW_BASELINE}_${RT_COMPILER^^}
fi

Expand Down Expand Up @@ -395,7 +395,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = jet.* ]]; then
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201127/${RT_COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20201127}
Expand All @@ -418,7 +418,7 @@ if [[ $CREATE_BASELINE == true ]]; then
rsync -a "${RTPWD}"/DATM* "${NEW_BASELINE}"/

# FIXME: S2S baselines are only available on these machines with Intel
if [[ $MACHINE_ID = hera.intel ]] || [[ $MACHINE_ID = orion.intel ]] || [[ $MACHINE_ID = cheyenne.intel ]] || [[ $MACHINE_ID = gaea.intel ]] || [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
if [[ $MACHINE_ID = hera.intel ]] || [[ $MACHINE_ID = orion.intel ]] || [[ $MACHINE_ID = cheyenne.intel ]] || [[ $MACHINE_ID = gaea.intel ]] || [[ $MACHINE_ID = jet.intel ]] || [[ $MACHINE_ID = wcoss_dell_p3 ]]; then
rsync -a "${RTPWD}"/MOM6_* "${NEW_BASELINE}"/
rsync -a "${RTPWD}"/CICE_* "${NEW_BASELINE}"/
rsync -a "${RTPWD}"/CPL_* "${NEW_BASELINE}"/
Expand Down