From 25b0a34db0094f03f5cfb722873b720e1ce76868 Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Fri, 25 Jul 2025 13:39:20 -0400 Subject: [PATCH 01/10] running on gaeac6 --- configuration/scripts/cice.batch.csh | 4 +-- .../{Macros.gaea_cray => Macros.gaeac6_intel} | 21 +++++++------- .../{env.gaea_cray => env.gaeac6_intel} | 28 +++++++++---------- 3 files changed, 25 insertions(+), 28 deletions(-) rename configuration/scripts/machines/{Macros.gaea_cray => Macros.gaeac6_intel} (66%) rename configuration/scripts/machines/{env.gaea_cray => env.gaeac6_intel} (57%) diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index c8c9ddc51..c2533f74a 100755 --- a/configuration/scripts/cice.batch.csh +++ b/configuration/scripts/cice.batch.csh @@ -400,8 +400,8 @@ else if (${ICE_MACHINE} =~ gaeac6*) then cat >> ${jobfile} << EOFB #SBATCH -J ${ICE_CASENAME} #SBATCH --partition=batch -#SBATCH --qos=${queue} -#SBATCH --account=sfs_emc +##SBATCH --qos=${queue} +#SBATCH --account=sfs-emc #SBATCH --clusters=c6 #SBATCH --time=${batchtime} #SBATCH --nodes=${nnodes} diff --git a/configuration/scripts/machines/Macros.gaea_cray b/configuration/scripts/machines/Macros.gaeac6_intel similarity index 66% rename from configuration/scripts/machines/Macros.gaea_cray rename to configuration/scripts/machines/Macros.gaeac6_intel index 851134514..5fd66d7fc 100644 --- a/configuration/scripts/machines/Macros.gaea_cray +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -1,21 +1,20 @@ #============================================================================== -# Makefile macros for NOAA hera, intel compiler +# Makefile macros for NOAA gaeac5, intel compiler #============================================================================== CPP := fpp CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} -CFLAGS := -c -O2 +CFLAGS := -c -O2 -fp-model precise -xHost FIXEDFLAGS := -132 -FREEFLAGS := -FFLAGS := -hbyteswapio +FREEFLAGS := -FR +FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -xHost FFLAGS_NOOPT:= -O0 -LDLAGS := -hbyteswapio ifeq ($(ICE_BLDDEBUG), true) - FFLAGS += -O0 -hfp0 -g -Rbcdps -Ktrap=fp + FFLAGS += -O0 -g -check bounds -check pointers -fpe1 -check noarg_temp_created -link_mpi=dbg else - FFLAGS += -O2 -hfp0 + FFLAGS += -O2 endif SCC := cc @@ -34,7 +33,7 @@ LD:= $(FC) NETCDF_PATH := $(NETCDF) -#PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs +PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs #PNETCDF_PATH := $(PNETCDF) #PNETCDF_PATH := /glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib @@ -50,8 +49,8 @@ INCLDIR := $(INCLDIR) -I$(INC_NETCDF) SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff ifeq ($(ICE_THREADED), true) - LDFLAGS += -fopenmp - CFLAGS += -fopenmp - FFLAGS += -fopenmp + LDFLAGS += -qopenmp + CFLAGS += -qopenmp + FFLAGS += -qopenmp endif diff --git a/configuration/scripts/machines/env.gaea_cray b/configuration/scripts/machines/env.gaeac6_intel similarity index 57% rename from configuration/scripts/machines/env.gaea_cray rename to configuration/scripts/machines/env.gaeac6_intel index db62615ee..87ad4c58b 100644 --- a/configuration/scripts/machines/env.gaea_cray +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -9,36 +9,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 purge -module load PrgEnv-cray -module load cce/18.0.0 -module load cray-libsci/24.07.0 +#module list +module load PrgEnv-intel/8.6.0 +module load intel/2025.0 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 # May be needed for OpenMP memory -#setenv OMP_STACKSIZE 64M +setenv OMP_STACKSIZE 64M endif -# May be needed for OpenMP memory -#setenv OMP_STACKSIZE 64M +env | grep NETCDF -endif - setenv ICE_MACHINE_MACHNAME gaea setenv ICE_MACHINE_MACHINFO "Cray XC40 Intel Haswell/Broadwell 2.3GHz, Gemini 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, cray-netcdf" 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 $HOME/scratch6/CICE_INPUTDATA +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 sfs-cpu setenv ICE_MACHINE_QUEUE "normal" setenv ICE_MACHINE_BLDTHRDS 1 setenv ICE_MACHINE_QSTAT "squeue --jobs=" From b970fb6ea37803a82a0bcbc3a6aa9ec44c404074 Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Fri, 25 Jul 2025 13:46:38 -0400 Subject: [PATCH 02/10] edit references in macros.gaeac6 --- configuration/scripts/machines/Macros.gaeac6_intel | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.gaeac6_intel b/configuration/scripts/machines/Macros.gaeac6_intel index 5fd66d7fc..e91a49371 100644 --- a/configuration/scripts/machines/Macros.gaeac6_intel +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -1,5 +1,5 @@ #============================================================================== -# Makefile macros for NOAA gaeac5, intel compiler +# Makefile macros for NOAA gaeac6, intel compiler #============================================================================== CPP := fpp @@ -12,6 +12,7 @@ FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -trace FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) +# 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 From d3dd3b8f007425a86aa8f992a6738c3b6a1de4ca Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Mon, 28 Jul 2025 07:58:25 -0400 Subject: [PATCH 03/10] anonymizing for repo --- configuration/scripts/machines/env.gaeac6_intel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 87ad4c58b..7ca73efb2 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -27,16 +27,16 @@ endif 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 "" setenv ICE_MACHINE_ENVNAME intel setenv ICE_MACHINE_ENVINFO "intel 2025.0, cray-mpich, cray-netcdf" setenv ICE_MACHINE_MAKE gmake setenv ICE_MACHINE_WKDIR $HOME/scratch6/CICE_RUNS -setenv ICE_MACHINE_INPUTDATA $HOME/scratch6/CICE_INPUTDATA +setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/scratch6/CICE_INPUTDATA setenv ICE_MACHINE_BASELINE $HOME/scratch6/CICE_BASELINE setenv ICE_MACHINE_SUBMIT "sbatch" setenv ICE_MACHINE_TPNODE 192 -setenv ICE_MACHINE_ACCT sfs-cpu +setenv ICE_MACHINE_ACCT A0 setenv ICE_MACHINE_QUEUE "normal" setenv ICE_MACHINE_BLDTHRDS 1 setenv ICE_MACHINE_QSTAT "squeue --jobs=" From 728b17c712aa45b5bb9416354396ca6a551e7acd Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Mon, 28 Jul 2025 15:10:26 -0400 Subject: [PATCH 04/10] remove generic and update gaeac5 --- .../scripts/machines/Macros.gaea_intel | 56 ------------------- configuration/scripts/machines/env.gaea_intel | 44 --------------- .../scripts/machines/env.gaeac5_intel | 11 ++-- .../scripts/machines/env.gaeac6_intel | 5 +- 4 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 configuration/scripts/machines/Macros.gaea_intel delete mode 100644 configuration/scripts/machines/env.gaea_intel diff --git a/configuration/scripts/machines/Macros.gaea_intel b/configuration/scripts/machines/Macros.gaea_intel deleted file mode 100644 index f4c4d2cbe..000000000 --- a/configuration/scripts/machines/Macros.gaea_intel +++ /dev/null @@ -1,56 +0,0 @@ -#============================================================================== -# Makefile macros for NOAA hera, intel compiler -#============================================================================== - -CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} -CFLAGS := -c -O2 -fp-model precise -xHost - -FIXEDFLAGS := -132 -FREEFLAGS := -FR -FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -xHost -FFLAGS_NOOPT:= -O0 - -ifeq ($(ICE_BLDDEBUG), true) - FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg -else - FFLAGS += -O2 -endif - -SCC := cc -SFC := ftn -MPICC := cc -MPIFC := ftn - -ifeq ($(ICE_COMMDIR), mpi) - FC := $(MPIFC) - CC := $(MPICC) -else - FC := $(SFC) - CC := $(SCC) -endif -LD:= $(FC) - -NETCDF_PATH := $(NETCDF) - -PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs - -#PNETCDF_PATH := $(PNETCDF) -#PNETCDF_PATH := /glade/u/apps/ch/opt/pio/2.2/mpt/2.15f/intel/17.0.1/lib - -INC_NETCDF := $(NETCDF_PATH)/include -LIB_NETCDF := $(NETCDF_PATH)/lib - -#LIB_PNETCDF := $(PNETCDF_PATH)/lib -#LIB_MPI := $(IMPILIBDIR) - -INCLDIR := $(INCLDIR) -I$(INC_NETCDF) -#SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L$(LIB_PNETCDF) -lpnetcdf -lgptl -SLIBS := -L$(LIB_NETCDF) -lnetcdf -lnetcdff - -ifeq ($(ICE_THREADED), true) - LDFLAGS += -qopenmp - CFLAGS += -qopenmp - FFLAGS += -qopenmp -endif - diff --git a/configuration/scripts/machines/env.gaea_intel b/configuration/scripts/machines/env.gaea_intel deleted file mode 100644 index 69bddb428..000000000 --- a/configuration/scripts/machines/env.gaea_intel +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/csh -f - -set inp = "undefined" -if ($#argv == 1) then - set inp = $1 -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 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 - -# May be needed for OpenMP memory -setenv OMP_STACKSIZE 64M - -endif - -env | grep NETCDF - -setenv ICE_MACHINE_MACHNAME gaea -setenv ICE_MACHINE_MACHINFO "Cray XC40 Intel Haswell/Broadwell 2.3GHz, Gemini Interconnect" -setenv ICE_MACHINE_ENVNAME intel -setenv ICE_MACHINE_ENVINFO "ifort 18.0.5 20180823, cray-mpich, cray-netcdf" -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_SUBMIT "sbatch" -setenv ICE_MACHINE_TPNODE 40 -setenv ICE_MACHINE_ACCT P0000000 -setenv ICE_MACHINE_QUEUE "normal" -setenv ICE_MACHINE_BLDTHRDS 1 -setenv ICE_MACHINE_QSTAT "squeue --jobs=" diff --git a/configuration/scripts/machines/env.gaeac5_intel b/configuration/scripts/machines/env.gaeac5_intel index 69bddb428..a1adde075 100644 --- a/configuration/scripts/machines/env.gaeac5_intel +++ b/configuration/scripts/machines/env.gaeac5_intel @@ -10,8 +10,9 @@ 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 PrgEnv-intel/8.6.0 +module load intel/2025.0 +module load cray-mpich 8.1.32 #module load intel/2023.2.0 #module load cce/18.0.0 module load cray-hdf5/1.14.3.1 @@ -29,15 +30,15 @@ endif 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_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 diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 7ca73efb2..8e63efd30 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -12,6 +12,7 @@ source $MODULESHOME/init/csh #module list 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 @@ -27,9 +28,9 @@ endif env | grep NETCDF setenv ICE_MACHINE_MACHNAME gaea -setenv ICE_MACHINE_MACHINFO "" +setenv ICE_MACHINE_MACHINFO "HPE-EX Cray3000, AMD EPYC 9654 2.4GHz, HPE Slingshot interconnect" setenv ICE_MACHINE_ENVNAME intel -setenv ICE_MACHINE_ENVINFO "intel 2025.0, 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/scratch6/CICE_RUNS setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/scratch6/CICE_INPUTDATA From decceba3aa9ad992ce2f907bd8542ad2fd45d49b Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Thu, 31 Jul 2025 11:55:23 -0400 Subject: [PATCH 05/10] queues for gaeac6 --- configuration/scripts/cice.batch.csh | 2 +- configuration/scripts/machines/env.gaeac6_intel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index 65b790e7d..81216b00c 100755 --- a/configuration/scripts/cice.batch.csh +++ b/configuration/scripts/cice.batch.csh @@ -387,7 +387,7 @@ else if (${ICE_MACHINE} =~ gaeac6*) then cat >> ${jobfile} << EOFB #SBATCH -J ${ICE_CASENAME} #SBATCH --partition=batch -##SBATCH --qos=${queue} +#SBATCH --qos=${queue} #SBATCH --account=sfs-emc #SBATCH --clusters=c6 #SBATCH --time=${batchtime} diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 8e63efd30..553389ae1 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -37,7 +37,7 @@ setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/scratch6/CICE_INPUTDATA setenv ICE_MACHINE_BASELINE $HOME/scratch6/CICE_BASELINE setenv ICE_MACHINE_SUBMIT "sbatch" setenv ICE_MACHINE_TPNODE 192 -setenv ICE_MACHINE_ACCT A0 -setenv ICE_MACHINE_QUEUE "normal" +setenv ICE_MACHINE_ACCT sfs-emc +setenv ICE_MACHINE_QUEUE "windfall" setenv ICE_MACHINE_BLDTHRDS 1 setenv ICE_MACHINE_QSTAT "squeue --jobs=" From 824d5b6d802f86e0d47dfd2470a03ff905fe9af5 Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Thu, 31 Jul 2025 12:06:07 -0400 Subject: [PATCH 06/10] update gaeac5 --- configuration/scripts/machines/Macros.gaeac5_intel | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.gaeac5_intel b/configuration/scripts/machines/Macros.gaeac5_intel index 794070214..e40c4231d 100644 --- a/configuration/scripts/machines/Macros.gaeac5_intel +++ b/configuration/scripts/machines/Macros.gaeac5_intel @@ -12,7 +12,9 @@ FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -trace 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 From affa5ae76dc0704834414600d9c0bdde53541460 Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Thu, 31 Jul 2025 12:38:02 -0400 Subject: [PATCH 07/10] updates per tc comments issue 1043 --- configuration/scripts/machines/Macros.gaeac5_intel | 2 +- configuration/scripts/machines/Macros.gaeac6_intel | 1 + configuration/scripts/machines/env.gaeac5_intel | 9 ++------- configuration/scripts/machines/env.gaeac6_intel | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/configuration/scripts/machines/Macros.gaeac5_intel b/configuration/scripts/machines/Macros.gaeac5_intel index e40c4231d..817f78a2e 100644 --- a/configuration/scripts/machines/Macros.gaeac5_intel +++ b/configuration/scripts/machines/Macros.gaeac5_intel @@ -8,7 +8,7 @@ CFLAGS := -c -O2 -fp-model precise -xHost 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) diff --git a/configuration/scripts/machines/Macros.gaeac6_intel b/configuration/scripts/machines/Macros.gaeac6_intel index e91a49371..144b07ae8 100644 --- a/configuration/scripts/machines/Macros.gaeac6_intel +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -12,6 +12,7 @@ FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -trace FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) +# 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 diff --git a/configuration/scripts/machines/env.gaeac5_intel b/configuration/scripts/machines/env.gaeac5_intel index a1adde075..7789e4d2b 100644 --- a/configuration/scripts/machines/env.gaeac5_intel +++ b/configuration/scripts/machines/env.gaeac5_intel @@ -7,20 +7,15 @@ 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/8.6.0 module load intel/2025.0 module load cray-mpich 8.1.32 -#module load intel/2023.2.0 -#module load cce/18.0.0 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 diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 553389ae1..319fbb695 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -37,7 +37,7 @@ setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/scratch6/CICE_INPUTDATA setenv ICE_MACHINE_BASELINE $HOME/scratch6/CICE_BASELINE setenv ICE_MACHINE_SUBMIT "sbatch" setenv ICE_MACHINE_TPNODE 192 -setenv ICE_MACHINE_ACCT sfs-emc +setenv ICE_MACHINE_ACCT A00000 setenv ICE_MACHINE_QUEUE "windfall" setenv ICE_MACHINE_BLDTHRDS 1 setenv ICE_MACHINE_QSTAT "squeue --jobs=" From 0c42e20eb4781cbfb5d3bd2bd6340edcab5ee7c5 Mon Sep 17 00:00:00 2001 From: Robert Grumbine Date: Fri, 1 Aug 2025 09:03:10 -0400 Subject: [PATCH 08/10] final c6 update(?) --- configuration/scripts/machines/Macros.gaeac6_intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.gaeac6_intel b/configuration/scripts/machines/Macros.gaeac6_intel index 144b07ae8..95b4954de 100644 --- a/configuration/scripts/machines/Macros.gaeac6_intel +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -8,7 +8,7 @@ CFLAGS := -c -O2 -fp-model precise -xHost 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) From 0bf5597437d877c134514b4812072b5d1d1c39f2 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 6 Aug 2025 15:38:13 -0400 Subject: [PATCH 09/10] Update gaea port --- configuration/scripts/cice.batch.csh | 4 ++-- configuration/scripts/machines/Macros.gaeac5_intel | 4 ++-- configuration/scripts/machines/Macros.gaeac6_intel | 4 ++-- configuration/scripts/machines/env.gaeac5_intel | 2 +- configuration/scripts/machines/env.gaeac6_intel | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index 81216b00c..1de12f5ce 100755 --- a/configuration/scripts/cice.batch.csh +++ b/configuration/scripts/cice.batch.csh @@ -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} @@ -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} diff --git a/configuration/scripts/machines/Macros.gaeac5_intel b/configuration/scripts/machines/Macros.gaeac5_intel index 817f78a2e..5a4c384fc 100644 --- a/configuration/scripts/machines/Macros.gaeac5_intel +++ b/configuration/scripts/machines/Macros.gaeac5_intel @@ -4,11 +4,11 @@ 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 -march=core-avx2 +FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -march=core-avx2 FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) diff --git a/configuration/scripts/machines/Macros.gaeac6_intel b/configuration/scripts/machines/Macros.gaeac6_intel index 95b4954de..9ba174738 100644 --- a/configuration/scripts/machines/Macros.gaeac6_intel +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -4,11 +4,11 @@ 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 -march=core-avx2 +FFLAGS := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte -march=core-avx2 FFLAGS_NOOPT:= -O0 ifeq ($(ICE_BLDDEBUG), true) diff --git a/configuration/scripts/machines/env.gaeac5_intel b/configuration/scripts/machines/env.gaeac5_intel index 7789e4d2b..cc6601f4f 100644 --- a/configuration/scripts/machines/env.gaeac5_intel +++ b/configuration/scripts/machines/env.gaeac5_intel @@ -22,7 +22,7 @@ setenv OMP_STACKSIZE 64M endif -env | grep NETCDF +#env | grep NETCDF setenv ICE_MACHINE_MACHNAME gaea setenv ICE_MACHINE_MACHINFO "HPE-EX Cray X3000, AMD EPYC 7H12 2.6 GHz, HPE Slingshot interconnect" diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 319fbb695..44697a19c 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -16,8 +16,8 @@ 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 @@ -25,7 +25,7 @@ setenv OMP_STACKSIZE 64M endif -env | grep NETCDF +#env | grep NETCDF setenv ICE_MACHINE_MACHNAME gaea setenv ICE_MACHINE_MACHINFO "HPE-EX Cray3000, AMD EPYC 9654 2.4GHz, HPE Slingshot interconnect" @@ -38,6 +38,6 @@ setenv ICE_MACHINE_BASELINE $HOME/scratch6/CICE_BASELINE setenv ICE_MACHINE_SUBMIT "sbatch" setenv ICE_MACHINE_TPNODE 192 setenv ICE_MACHINE_ACCT A00000 -setenv ICE_MACHINE_QUEUE "windfall" +setenv ICE_MACHINE_QUEUE "normal" setenv ICE_MACHINE_BLDTHRDS 1 setenv ICE_MACHINE_QSTAT "squeue --jobs=" From b6133860b2c9bfadbede0a15f065d179fde0176d Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 6 Aug 2025 22:59:07 -0400 Subject: [PATCH 10/10] Update gaea port --- configuration/scripts/machines/env.gaeac5_intel | 4 ++-- configuration/scripts/machines/env.gaeac6_intel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/scripts/machines/env.gaeac5_intel b/configuration/scripts/machines/env.gaeac5_intel index cc6601f4f..2fbbffef8 100644 --- a/configuration/scripts/machines/env.gaeac5_intel +++ b/configuration/scripts/machines/env.gaeac5_intel @@ -10,7 +10,7 @@ if ("$inp" != "-nomodules") then source $MODULESHOME/init/csh module load PrgEnv-intel/8.6.0 module load intel/2025.0 -module load cray-mpich 8.1.32 +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 @@ -30,7 +30,7 @@ setenv ICE_MACHINE_ENVNAME intel 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 128 diff --git a/configuration/scripts/machines/env.gaeac6_intel b/configuration/scripts/machines/env.gaeac6_intel index 44697a19c..0963ecc69 100644 --- a/configuration/scripts/machines/env.gaeac6_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -33,7 +33,7 @@ setenv ICE_MACHINE_ENVNAME intel 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/scratch6/CICE_RUNS -setenv ICE_MACHINE_INPUTDATA /ncrc/home1/Robert.Grumbine/scratch6/CICE_INPUTDATA +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 192