Update port to Cheyenne and Derecho

All results are bit-for-bit except some pgi tests. All machine/compiler combinations pass all tests. Update cheyenne gnu, intel, pgi compiler version Minor update to Derecho intel Add Derecho cray, gnu, intelclassic, inteloneapi, nvhpc
CICE-Consortium · Sep 7, 2023 · a7b4f21 · a7b4f21
1 parent 23b6c12
commit a7b4f21
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/configuration/scripts/machines/Macros.derecho_intel b/configuration/scripts/machines/Macros.derecho_intel
@@ -1,5 +1,5 @@
 #==============================================================================
-# Makefile macros for NCAR cheyenne, intel compiler
+# Makefile macros for NCAR derecho, intel compiler
 #==============================================================================
 
 CPP        := fpp

diff --git a/configuration/scripts/machines/env.cheyenne_gnu b/configuration/scripts/machines/env.cheyenne_gnu
@@ -7,21 +7,21 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load gnu/8.3.0
-module load mpt/2.19
+module load ncarenv/1.3
+module load gnu/10.1.0
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load netcdf/4.6.3
+module load netcdf/4.8.1
 
 endif
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
 setenv ICE_MACHINE_ENVNAME gnu
-setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 8.3.0"
+setenv ICE_MACHINE_ENVINFO "GNU Fortran (GCC) 10.1.0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev

diff --git a/configuration/scripts/machines/env.cheyenne_intel b/configuration/scripts/machines/env.cheyenne_intel
@@ -7,21 +7,21 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load intel/19.0.2
-module load mpt/2.19
+module load ncarenv/1.3
+module load intel/19.1.1
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load netcdf/4.6.3
+module load netcdf/4.8.1
 
 endif
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
 setenv ICE_MACHINE_ENVNAME intel
-setenv ICE_MACHINE_ENVINFO "ifort 19.0.2.187 20190117"
+setenv ICE_MACHINE_ENVINFO "ifort 19.1.1.217 20200306"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev

diff --git a/configuration/scripts/machines/env.cheyenne_pgi b/configuration/scripts/machines/env.cheyenne_pgi
@@ -7,21 +7,21 @@ endif
 
 if ("$inp" != "-nomodules") then
 
-source /glade/u/apps/ch/opt/lmod/7.2.1/lmod/7.2.1/init/csh
+source ${MODULESHOME}/init/csh
 
 module purge
-module load ncarenv/1.2
-module load pgi/19.9
-module load mpt/2.21
+module load ncarenv/1.3
+module load pgi/20.4
+module load mpt/2.22
 module load ncarcompilers/0.5.0
-module load netcdf/4.7.3
+module load netcdf/4.7.4
 
 endif
 
 setenv ICE_MACHINE_MACHNAME cheyenne
 setenv ICE_MACHINE_MACHINFO "SGI ICE XA Xeon E5-2697V4 Broadwell"
 setenv ICE_MACHINE_ENVNAME pgi
-setenv ICE_MACHINE_ENVINFO "pgf90 19.9-0"
+setenv ICE_MACHINE_ENVINFO "pgf90 20.4-0"
 setenv ICE_MACHINE_MAKE gmake
 setenv ICE_MACHINE_WKDIR /glade/scratch/$user/ICEPACK_RUNS
 setenv ICE_MACHINE_INPUTDATA /glade/p/cesm/pcwg_dev