From 0bf5597437d877c134514b4812072b5d1d1c39f2 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 6 Aug 2025 15:38:13 -0400 Subject: [PATCH 1/2] 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 2/2] 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