Update NOAA ports, hera and orion (CICE-Consortium#449)

* update hera port * remove phase2 and theia machines * initial orion port
DeniseWorthen · May 26, 2020 · 2ef8862 · 2ef8862
1 parent c1eef87
commit 2ef8862
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 336 deletions.
diff --git a/configuration/scripts/cice.batch.csh b/configuration/scripts/cice.batch.csh
@@ -204,35 +204,36 @@ cat >> ${jobfile} << EOFB
 #PBS -l walltime=${batchtime}
 EOFB
 
-else if (${ICE_MACHINE} =~ theia*) then
+else if (${ICE_MACHINE} =~ hera*) then
 cat >> ${jobfile} << EOFB
 #SBATCH -J ${ICE_CASENAME}
-#SBATCH -t ${batchtime}
-#SBATCH -q batch
-#SBATCH -A marine-cpu
-#SBATCH -N ${nnodes}
+#SBATCH --partition=hera
+#SBATCH --qos=${queue}
+#SBATCH -A ${acct}
+#SBATCH --time=${batchtime}
+#SBATCH --nodes=${nnodes}
+#SBATCH --ntasks-per-node=${taskpernodelimit}
+#SBATCH --cpus-per-task=${nthrds}
 #SBATCH -e slurm%j.err
 #SBATCH -o slurm%j.out
-#SBATCH --mail-type FAIL
-#SBATCH --mail-user=robert.grumbine@noaa.gov
+##SBATCH --mail-type FAIL
+##SBATCH --mail-user=xxx@noaa.gov
 EOFB
 
-else if (${ICE_MACHINE} =~ hera*) then
+else if (${ICE_MACHINE} =~ orion*) then
 cat >> ${jobfile} << EOFB
 #SBATCH -J ${ICE_CASENAME}
-#SBATCH -t `echo ${batchtime} | cut -f1-2 -d:`
-#SBATCH -q batch
-#SBATCH -A marine-cpu
-#SBATCH -N ${nnodes}
+#SBATCH --partition=orion
+#SBATCH --qos=${queue}
+#SBATCH -A ${acct}
+#SBATCH --time=${batchtime}
+#SBATCH --nodes=${nnodes}
+#SBATCH --ntasks-per-node=${taskpernodelimit}
+#SBATCH --cpus-per-task=${nthrds}
 #SBATCH -e slurm%j.err
 #SBATCH -o slurm%j.out
-#SBATCH --mail-type FAIL
-#SBATCH [email protected]
-EOFB
-
-else if (${ICE_MACHINE} =~ phase2*) then
-cat >> ${jobfile} << EOFB
-# nothing to do
+##SBATCH --mail-type FAIL
+##SBATCH [email protected]
 EOFB
 
 else if (${ICE_MACHINE} =~ phase3*) then

diff --git a/configuration/scripts/cice.launch.csh b/configuration/scripts/cice.launch.csh
@@ -165,21 +165,19 @@ EOFR
 endif
 
 #=======
-else if (${ICE_MACHINE} =~ theia*) then
+else if (${ICE_MACHINE} =~ hera*) then
 cat >> ${jobfile} << EOFR
-#mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
 srun -n ${ntasks} -c ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
-#./cice >&! \$ICE_RUNLOG_FILE
 EOFR
+
 #=======
-else if (${ICE_MACHINE} =~ high_Sierra*) then
+else if (${ICE_MACHINE} =~ orion*) then
 cat >> ${jobfile} << EOFR
-mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
-#./cice >&! \$ICE_RUNLOG_FILE
+srun -n ${ntasks} -c ${nthrds} ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 
 #=======
-else if (${ICE_MACHINE} =~ phase2*) then
+else if (${ICE_MACHINE} =~ high_Sierra*) then
 cat >> ${jobfile} << EOFR
 mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
 #./cice >&! \$ICE_RUNLOG_FILE
@@ -191,26 +189,13 @@ cat >> ${jobfile} << EOFR
 mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
 #./cice >&! \$ICE_RUNLOG_FILE
 EOFR
+
 #=======
 else if (${ICE_MACHINE} =~ testmachine*) then
 cat >> ${jobfile} << EOFR
 ./cice >&! \$ICE_RUNLOG_FILE
 EOFR
 
-#=======
-else if (${ICE_MACHINE} =~ phase3*) then
-cat >> ${jobfile} << EOFR
-mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-
-#=======
-else if (${ICE_MACHINE} =~ phase2*) then
-cat >> ${jobfile} << EOFR
-mpirun -np ${ntasks} ./cice >&! \$ICE_RUNLOG_FILE
-EOFR
-
-=======
-
 #=======
 else if (${ICE_MACHINE} =~ travisCI*) then
 if (${ICE_COMMDIR} =~ serial*) then

diff --git a/configuration/scripts/machines/Macros.hera_intel b/configuration/scripts/machines/Macros.hera_intel
@@ -1,45 +1,22 @@
 #==============================================================================
-# Makefile macros for theia - intel and openmpi compilers
+# Makefile macros for NOAA hera, intel compiler
 #==============================================================================
 
-CPP        := cpp
-CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
-CFLAGS     := -c -O2  -xHost
+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   -xHost
-
+FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte  -xHost
 FFLAGS_NOOPT:= -O0
 
 ifeq ($(ICE_BLDDEBUG), true)
-#RG: this looks more like gfortran options:  
-##  FFLAGS     += -O0 -g -fcheck=bounds -finit-real=nan -fimplicit-none -ffpe-trap=invalid,zero,overflow
-  FFLAGS     += -O0 -g -check-bounds -implicit-none -fpe3
+  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
 else
   FFLAGS     += -O2
 endif
 
-#Note that on theia mpif90 refers to gfortran even though it is in the intel bin
-FC := mpiifort
-MPIFC:= mpiifort
-LD:= $(MPIFC)
-
-NETCDF_PATH := $(NETCDF)
-
-ifeq ($(ICE_IOTYPE), netcdf)
-    NETCDF_PATH := $(shell nc-config --prefix)
-    INCLDIR := $(INCLDIR) -I$(NETCDF_PATH)/include
-    LIB_NETCDF := $(NETCDF_PATH)/lib
-    LIB_PNETCDF := 
-    SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff
-else
-    SLIBS   := 
-endif
-
-LIB_MPI := 
-
-
 SCC   := icc 
 SFC   := ifort
 MPICC := mpiicc
@@ -52,9 +29,28 @@ 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
+   LDFLAGS += -qopenmp 
+   CFLAGS += -qopenmp 
+   FFLAGS += -qopenmp 
 endif
+
diff --git a/configuration/scripts/machines/Macros.high_Sierra_gnu b/configuration/scripts/machines/Macros.high_Sierra_gnu
@@ -1,5 +1,5 @@
 #==============================================================================
-# Makefile macros for Travis-CI - GCC and openmpi compilers
+# Makefile macros for high sierra - GCC and openmpi compilers
 #==============================================================================
 
 CPP        := cpp

diff --git a/...tion/scripts/machines/Macros.phase2_intel → ...ation/scripts/machines/Macros.orion_intel b/...tion/scripts/machines/Macros.phase2_intel → ...ation/scripts/machines/Macros.orion_intel
@@ -1,15 +1,14 @@
 #==============================================================================
-# Makefile macros for generic test machine, intel compiler
+# Makefile macros for MSU orion, intel compiler
 #==============================================================================
 
 CPP        := fpp
 CPPDEFS    := -DFORTRANUNDERSCORE ${ICE_CPPDEFS}
-#CFLAGS     := -c -O2 -fp-model precise   -xHost
-CFLAGS     := -c -O2 
+CFLAGS     := -c -O2 -fp-model precise   -xHost
 
 FIXEDFLAGS := -132
 FREEFLAGS  := -FR
-FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback   -xHost
+FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -traceback -align array64byte  -xHost
 FFLAGS_NOOPT:= -O0
 
 ifeq ($(ICE_BLDDEBUG), true)
@@ -20,7 +19,7 @@ endif
 
 SCC   := icc 
 SFC   := ifort
-MPICC := mpicc
+MPICC := mpiicc
 MPIFC := mpiifort
 
 ifeq ($(ICE_COMMDIR), mpi)
@@ -32,16 +31,22 @@ else
 endif
 LD:= $(FC)
 
-NETCDF_PATH := $(NETCDF)
+NETCDF_PATH := $(NETCDF_ROOT)
 
 PIO_CONFIG_OPTS:= --enable-filesystem-hints=gpfs 
 
-INCLDIR := $(INCLDIR) $(NETCDF_INCLUDE)
+#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_MPI := $(IMPILIBDIR)
 
-SLIBS   := -L$(LIB_NETCDF) -lnetcdf -lnetcdff 
+#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 

diff --git a/configuration/scripts/machines/Macros.phase3_intel b/configuration/scripts/machines/Macros.phase3_intel
@@ -1,5 +1,5 @@
 #==============================================================================
-# Makefile macros for generic test machine, intel compiler
+# Makefile macros for wcoss phase3 machine, intel compiler
 #==============================================================================
 
 CPP        := fpp

diff --git a/configuration/scripts/machines/Macros.theia_gnu b/configuration/scripts/machines/Macros.theia_gnu
diff --git a/configuration/scripts/machines/Macros.theia_intel b/configuration/scripts/machines/Macros.theia_intel