Skip to content

port for gaeac6 #1043

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

Merged
apcraig merged 12 commits into from
Aug 8, 2025
Merged

port for gaeac6 #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
25b0a34
running on gaeac6
rgrumbine Jul 25, 2025
91f3a49
Merge branch 'CICE-Consortium:main' into dev/gaea
rgrumbine Jul 25, 2025
b970fb6
edit references in macros.gaeac6
rgrumbine Jul 25, 2025
d3dd3b8
anonymizing for repo
rgrumbine Jul 28, 2025
728b17c
remove generic and update gaeac5
rgrumbine Jul 28, 2025
decceba
queues for gaeac6
rgrumbine Jul 31, 2025
824d5b6
update gaeac5
rgrumbine Jul 31, 2025
affa5ae
updates per tc comments issue 1043
rgrumbine Jul 31, 2025
0c42e20
final c6 update(?)
rgrumbine Aug 1, 2025
0bf5597
Update gaea port
apcraig Aug 6, 2025
b613386
Update gaea port
apcraig Aug 7, 2025
1ff5408
Merge pull request #1 from apcraig/gaea_tc02
rgrumbine Aug 8, 2025
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 configuration/scripts/cice.batch.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
#SBATCH --partition=batch
#SBATCH --qos=${queue}
#SBATCH --account=nggps_emc
#SBATCH --account=${acct}
#SBATCH --clusters=c5
#SBATCH --time=${batchtime}
#SBATCH --nodes=${nnodes}
Expand All @@ -388,7 +388,7 @@ cat >> ${jobfile} << EOFB
#SBATCH -J ${ICE_CASENAME}
#SBATCH --partition=batch
#SBATCH --qos=${queue}
#SBATCH --account=sfs_emc
#SBATCH --account=${acct}
#SBATCH --clusters=c6
#SBATCH --time=${batchtime}
#SBATCH --nodes=${nnodes}
Expand Down
57 changes: 0 additions & 57 deletions configuration/scripts/machines/Macros.gaea_cray
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions configuration/scripts/machines/Macros.gaeac5_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost
CFLAGS := -c -O2 -fp-model precise -march=core-avx2

FIXEDFLAGS := -132
FREEFLAGS := -FR
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -xHost
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -march=core-avx2
FFLAGS_NOOPT:= -O0

ifeq ($(ICE_BLDDEBUG), true)
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
# 7/2025: cannot use -check uninit
# 7/2025: must use fpe1 rather than fpe0
FFLAGS += -O0 -g -check bounds -check pointers -fpe1 -check noarg_temp_created -link_mpi=dbg
else
FFLAGS += -O2
endif
Expand Down
10 changes: 6 additions & 4 deletions ...ration/scripts/machines/Macros.gaea_intel → ...tion/scripts/machines/Macros.gaeac6_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
#==============================================================================
# Makefile macros for NOAA hera, intel compiler
# Makefile macros for NOAA gaeac6, intel compiler
#==============================================================================

CPP := fpp
CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
CFLAGS := -c -O2 -fp-model precise -xHost
CFLAGS := -c -O2 -fp-model precise -march=core-avx2

FIXEDFLAGS := -132
FREEFLAGS := -FR
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -xHost
FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -march=core-avx2
FFLAGS_NOOPT:= -O0

ifeq ($(ICE_BLDDEBUG), true)
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
# no -check uninit 25 Jul 2025
# fpe1 rather than fpe0 due to bug in hdf library 25 Jul 2025
FFLAGS += -O0 -g -check bounds -check pointers -fpe1 -check noarg_temp_created -link_mpi=dbg
else
FFLAGS += -O2
endif
Expand Down
44 changes: 0 additions & 44 deletions configuration/scripts/machines/env.gaea_cray
View file
Open in desktop

This file was deleted.

24 changes: 10 additions & 14 deletions configuration/scripts/machines/env.gaeac5_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,33 @@ endif

if ("$inp" != "-nomodules") then

#source /lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.csh
source $MODULESHOME/init/csh
#module list
module load PrgEnv-intel
module load intel
#module load intel/2023.2.0
#module load cce/18.0.0
module load PrgEnv-intel/8.6.0
module load intel/2025.0
module load cray-mpich/8.1.32
module load cray-hdf5/1.14.3.1
module load cray-netcdf/4.9.0.13
setenv NETCDF $NETCDF_DIR
echo zzz final module list
module list
#module avail intel
#echo zzz final module list
#module list

# May be needed for OpenMP memory
setenv OMP_STACKSIZE 64M

endif

env | grep NETCDF
#env | grep NETCDF

setenv ICE_MACHINE_MACHNAME gaea
setenv ICE_MACHINE_MACHINFO "Cray XC40 Intel Haswell/Broadwell 2.3GHz, Gemini Interconnect"
setenv ICE_MACHINE_MACHINFO "HPE-EX Cray X3000, AMD EPYC 7H12 2.6 GHz, HPE Slingshot interconnect"
setenv ICE_MACHINE_ENVNAME intel
setenv ICE_MACHINE_ENVINFO "ifort 18.0.5 20180823, cray-mpich, cray-netcdf"
setenv ICE_MACHINE_ENVINFO "ifort 2025.0, cray-mpich 8.1.32, cray-netcdf 4.9.0.13"
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR $HOME/scratch/CICE_RUNS
setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/rgdev/CICE_INPUTDATA
setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Anthony.Craig/scratch
setenv ICE_MACHINE_BASELINE $HOME/scratch/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "sbatch"
setenv ICE_MACHINE_TPNODE 40
setenv ICE_MACHINE_TPNODE 128
setenv ICE_MACHINE_ACCT P0000000
setenv ICE_MACHINE_QUEUE "normal"
setenv ICE_MACHINE_BLDTHRDS 1
Expand Down
27 changes: 13 additions & 14 deletions ...iguration/scripts/machines/env.gaea_intel → ...uration/scripts/machines/env.gaeac6_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,34 @@ if ("$inp" != "-nomodules") then
#source /lustre/f2/pdata/esrl/gsd/contrib/lua-5.1.4.9/init/init_lmod.csh
source $MODULESHOME/init/csh
#module list
module load PrgEnv-intel
module load intel
#module load intel/2023.2.0
#module load cce/18.0.0
module load PrgEnv-intel/8.6.0
module load intel/2025.0
module load cray-mpich/8.1.32
module load cray-hdf5/1.14.3.1
module load cray-netcdf/4.9.0.13
setenv NETCDF $NETCDF_DIR
echo zzz final module list
module list
#echo zzz final module list
#module list
#module avail intel

# May be needed for OpenMP memory
setenv OMP_STACKSIZE 64M

endif

env | grep NETCDF
#env | grep NETCDF

setenv ICE_MACHINE_MACHNAME gaea
setenv ICE_MACHINE_MACHINFO "Cray XC40 Intel Haswell/Broadwell 2.3GHz, Gemini Interconnect"
setenv ICE_MACHINE_MACHINFO "HPE-EX Cray3000, AMD EPYC 9654 2.4GHz, HPE Slingshot interconnect"
setenv ICE_MACHINE_ENVNAME intel
setenv ICE_MACHINE_ENVINFO "ifort 18.0.5 20180823, cray-mpich, cray-netcdf"
setenv ICE_MACHINE_ENVINFO "intel 2025.0, cray-mpich 8.1.32, cray-netcdf 4.9.0.13"
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR $HOME/scratch/CICE_RUNS
setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/rgdev/CICE_INPUTDATA
setenv ICE_MACHINE_BASELINE $HOME/scratch/CICE_BASELINE
setenv ICE_MACHINE_WKDIR $HOME/scratch6/CICE_RUNS
setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Anthony.Craig/scratch6
setenv ICE_MACHINE_BASELINE $HOME/scratch6/CICE_BASELINE
setenv ICE_MACHINE_SUBMIT "sbatch"
setenv ICE_MACHINE_TPNODE 40
setenv ICE_MACHINE_ACCT P0000000
setenv ICE_MACHINE_TPNODE 192
setenv ICE_MACHINE_ACCT A00000
setenv ICE_MACHINE_QUEUE "normal"
setenv ICE_MACHINE_BLDTHRDS 1
setenv ICE_MACHINE_QSTAT "squeue --jobs="
Loading