diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh index 220313bfa..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.gaea_cray b/configuration/scripts/machines/Macros.gaea_cray deleted file mode 100644 index 851134514..000000000 --- a/configuration/scripts/machines/Macros.gaea_cray +++ /dev/null @@ -1,57 +0,0 @@ -#============================================================================== -# Makefile macros for NOAA hera, intel compiler -#============================================================================== - -CPP := fpp -CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} -CFLAGS := -c -O2 - -FIXEDFLAGS := -132 -FREEFLAGS := -FFLAGS := -hbyteswapio -FFLAGS_NOOPT:= -O0 -LDLAGS := -hbyteswapio - -ifeq ($(ICE_BLDDEBUG), true) - FFLAGS += -O0 -hfp0 -g -Rbcdps -Ktrap=fp -else - FFLAGS += -O2 -hfp0 -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 += -fopenmp - CFLAGS += -fopenmp - FFLAGS += -fopenmp -endif - diff --git a/configuration/scripts/machines/Macros.gaeac5_intel b/configuration/scripts/machines/Macros.gaeac5_intel index 794070214..5a4c384fc 100644 --- a/configuration/scripts/machines/Macros.gaeac5_intel +++ b/configuration/scripts/machines/Macros.gaeac5_intel @@ -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 diff --git a/configuration/scripts/machines/Macros.gaea_intel b/configuration/scripts/machines/Macros.gaeac6_intel similarity index 76% rename from configuration/scripts/machines/Macros.gaea_intel rename to configuration/scripts/machines/Macros.gaeac6_intel index f4c4d2cbe..9ba174738 100644 --- a/configuration/scripts/machines/Macros.gaea_intel +++ b/configuration/scripts/machines/Macros.gaeac6_intel @@ -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 diff --git a/configuration/scripts/machines/env.gaea_cray b/configuration/scripts/machines/env.gaea_cray deleted file mode 100644 index db62615ee..000000000 --- a/configuration/scripts/machines/env.gaea_cray +++ /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 purge -module load PrgEnv-cray -module load cce/18.0.0 -module load cray-libsci/24.07.0 -module load cray-hdf5/1.14.3.1 -module load cray-netcdf/4.9.0.13 -setenv NETCDF $NETCDF_DIR -module list - -# May be needed for OpenMP memory -#setenv OMP_STACKSIZE 64M - -endif - -# May be needed for OpenMP memory -#setenv OMP_STACKSIZE 64M - -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_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..2fbbffef8 100644 --- a/configuration/scripts/machines/env.gaeac5_intel +++ b/configuration/scripts/machines/env.gaeac5_intel @@ -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 diff --git a/configuration/scripts/machines/env.gaea_intel b/configuration/scripts/machines/env.gaeac6_intel similarity index 53% rename from configuration/scripts/machines/env.gaea_intel rename to configuration/scripts/machines/env.gaeac6_intel index 69bddb428..0963ecc69 100644 --- a/configuration/scripts/machines/env.gaea_intel +++ b/configuration/scripts/machines/env.gaeac6_intel @@ -10,15 +10,14 @@ 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 @@ -26,19 +25,19 @@ 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="