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.

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

Add support for Gaea C5 (includes PR #1977: new ccpp SDFs added to support RRFS multiphysics ensemble and add tob in ocean output)(Includes PR #1997) #1784

Merged
merged 52 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
d3ddb94
Re-add C5 modulefile.
ulmononian Aug 23, 2023
0f8d71d
Reinstate all the c5 changes that I botched with my git ignorance.
ulmononian Aug 23, 2023
b75413f
Update ufs_common. Upate c5 modulefile.
Aug 24, 2023
6a707d8
Bring up to date w/ develop hash 7e9063d.
Aug 24, 2023
37015ed
TPN adjustments for C5 regional_atmaq tests.
Aug 25, 2023
97d9744
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Aug 28, 2023
f6ea217
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Sep 6, 2023
77b8082
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Sep 13, 2023
8567959
Update.
Sep 13, 2023
a8ac696
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Sep 18, 2023
dc186c3
Bring up to date w/ develop hash a75d5fe.
Sep 26, 2023
1504187
Remove set -eu from module-setup.sh
ulmononian Oct 5, 2023
3670a93
Reinstate "set -eu" in module-setup.sh
ulmononian Oct 16, 2023
bdf27d7
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Oct 20, 2023
d2f86ce
Update c5 & ufs_common modulefiles; cherry-pick GOCART hash update fr…
Oct 23, 2023
26576ec
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Oct 23, 2023
de1d9e4
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Nov 2, 2023
27ad000
Update rt.sh adding new DISKNM for Gaea_C5
zach1221 Nov 6, 2023
a0707e9
Merge recent updates from 'develop' into Gaea-C5 updates/PR1784
Nov 13, 2023
f67260d
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Nov 14, 2023
7dcc551
FV3 switched to personal fork
JiliDong-NOAA Nov 14, 2023
7dedc6f
updates for gaea-c5 modulefiles, scripts
Nov 15, 2023
fd892c1
Merge remote-tracking branch 'origin3/feature/add_c5' into feature_ga…
Nov 15, 2023
4809303
merge develop
JiliDong-NOAA Nov 17, 2023
001d965
Merge pull request #13 from natalie-perlin/feature_gaea-c5
ulmononian Nov 21, 2023
dca1b26
Merge remote-tracking branch 'upstream/develop' into feature/add_c5
jkbk2004 Nov 27, 2023
3755482
Merge remote-tracking branch 'upstream/develop' into feature/add_c5
jkbk2004 Nov 27, 2023
1c04238
Update rt.conf fix gaea machine name
zach1221 Nov 28, 2023
c59c4ba
Update rt.conf fix column alignment
zach1221 Nov 28, 2023
cc66dcd
Delete cmake/configure_gaea_c5.intel.cmake
zach1221 Nov 28, 2023
47614fc
Update ufs_gaea-c5.intel.lua unload cray-libsci
zach1221 Nov 28, 2023
a797b81
update FV3
JiliDong-NOAA Nov 29, 2023
12da293
update FV3
JiliDong-NOAA Nov 30, 2023
bc40b8c
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Nov 30, 2023
71e9323
add ocean variable tob in diag_table to address issue #2019
JiliDong-NOAA Dec 1, 2023
5fcdc06
update FV3
JiliDong-NOAA Dec 1, 2023
1064788
Merge branch 'ufs-community:develop' into feature/add_c5
ulmononian Dec 1, 2023
85950d0
Update fv3 hash to jili's c9d4928.
Dec 1, 2023
a592791
Merge remote-tracking branch 'upstream/rrfsens_v0.2.0' into feature/a…
jkbk2004 Dec 1, 2023
8b507f1
Acorn RT Log
BrianCurtis-NOAA Dec 2, 2023
29aa3bc
WCOSS2 RT Log
BrianCurtis-NOAA Dec 2, 2023
f284316
add hera RT log: passed
jkbk2004 Dec 4, 2023
729c054
add jet RT log: passed
jkbk2004 Dec 4, 2023
7683458
add gaea RT log: passed
jkbk2004 Dec 4, 2023
5db63fe
add orion RT logs: passed
zach1221 Dec 4, 2023
b0eb93b
Load nccmp in c5 lua file
ulmononian Dec 4, 2023
f9adb7f
add control_p8 gnu logs: passed
zach1221 Dec 4, 2023
92914bf
add regional_control gnu logs: passed
zach1221 Dec 4, 2023
5d2ca22
add cpld_control_nowave_noaero_p8 gnu logs: passed
zach1221 Dec 4, 2023
91a6d91
add hercules RT logs: passed
zach1221 Dec 4, 2023
46857d8
add gaea-c5 RT log: passed
jkbk2004 Dec 4, 2023
5d7b17d
update fv3 hash and revert change in gitmodules
jkbk2004 Dec 4, 2023
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: 4 additions & 0 deletions cmake/configure_gaea-c5.intel.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
4 changes: 4 additions & 0 deletions cmake/configure_gaea_c5.intel.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
DeniseWorthen marked this conversation as resolved.
Show resolved Hide resolved
set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
32 changes: 32 additions & 0 deletions modulefiles/ufs_gaea-c5.intel.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
help([[
This module loads libraries required for building and running UFS Weather Model
on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
]])

whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C5 ]===])

load("PrgEnv-intel/8.3.3")
load("intel-classic/2023.1.0")
load("cray-mpich/8.1.25")
load("python/3.9.12")

prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
load(pathJoin("stack-python", stack_python_ver))

load("ufs_common")

unload("darshan-runtime")

BrianCurtis-NOAA marked this conversation as resolved.
Show resolved Hide resolved
setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")
setenv("CMAKE_Platform","gaea-c5.intel")
5 changes: 4 additions & 1 deletion tests/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@ set +x
if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
else
# Activate lua environment for gaea
# Activate lua environment for gaea c4
if [[ $MACHINE_ID == gaea ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
# Activate lua environment for gaea c5
elif [[ $MACHINE_ID == gaea-c5 ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
fi
natalie-perlin marked this conversation as resolved.
Show resolved Hide resolved
# Load fv3 module
module use $PATHTR/modulefiles
Expand Down
13 changes: 13 additions & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,19 @@ elif [[ $MACHINE_ID = gaea ]]; then
INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
WAV_tasks_atmw_gdas=264

elif [[ $MACHINE_ID = gaea-c5 ]]; then

TPN=128

INPES_dflt=3 ; JNPES_dflt=8
INPES_thrd=3 ; JNPES_thrd=4
INPES_c384=6 ; JNPES_c384=8 ; THRD_c384=1
INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2

THRD_cpl_atmw_gdas=3
INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
WAV_tasks_atmw_gdas=264

elif [[ $MACHINE_ID = cheyenne ]]; then

TPN=36
Expand Down
9 changes: 9 additions & 0 deletions tests/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ case $(hostname -f) in
gaea15.ncrc.gov) MACHINE_ID=gaea ;; ### gaea15
gaea16.ncrc.gov) MACHINE_ID=gaea ;; ### gaea16

gaea51.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea51
gaea52.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea52
gaea53.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea53
gaea54.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea54
gaea55.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea55
gaea56.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea56
gaea57.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea57
gaea58.ncrc.gov) MACHINE_ID=gaea-c5 ;; ### gaea58

hfe01) MACHINE_ID=hera ;; ### hera01
hfe02) MACHINE_ID=hera ;; ### hera02
hfe03) MACHINE_ID=hera ;; ### hera03
Expand Down
21 changes: 21 additions & 0 deletions tests/fv3_conf/compile_slurm.IN_gaea-c5
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash -l
#SBATCH -e err
#SBATCH -o out
#SBATCH --account=@[ACCNR]
##SBATCH --qos=@[QUEUE]
#SBATCH --clusters=es
#SBATCH --partition=eslogin_c5
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=8
#SBATCH --time=180
#SBATCH --job-name="@[JBNME]"

set -eux

echo -n " $( date +%s )," > job_timestamp.txt
echo "Compile started: " `date`

@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]

echo "Compile ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
38 changes: 38 additions & 0 deletions tests/fv3_conf/fv3_slurm.IN_gaea-c5
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash -l
#SBATCH -e err
#SBATCH -o out
#SBATCH --job-name="@[JBNME]"
#SBATCH --account=@[ACCNR]
#SBATCH --qos=@[QUEUE]
#SBATCH --clusters=c5
#SBATCH --partition=batch
#SBATCH --nodes=@[NODES]
#SBATCH --ntasks-per-node=@[TPN]
#SBATCH --time=@[WLCLK]

set -eux
echo -n " $( date +%s )," > job_timestamp.txt

set +x
MACHINE_ID=gaea-c5
source ./module-setup.sh
module use --prepend $PWD/modulefiles
module load modules.fv3
module list
set -x

echo "Model started: " `date`

export OMP_NUM_THREADS=@[THRD]
export OMP_STACKSIZE=1024M
export NC_BLKSZ=1M
export ESMF_RUNTIME_PROFILE=ON
export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"

# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

srun --label -n @[TASKS] ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
Loading