Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

configuration/scripts/forapps/ufs/comp_ice.backend.clean

@@ -16,6 +16,8 @@ else if (${MACHINE_ID} =~ hera*) then
   setenv ARCH hera_intel
 else if (${MACHINE_ID} =~ wcoss*) then
   setenv ARCH wcoss_dell_p3_intel
+else if (${MACHINE_ID} =~ stampede*) then
+  setenv ARCH stampede_intel
 else
   echo "CICE6 ${0}: ERROR in ARCH setup, ${hname}"
   exit -2

configuration/scripts/forapps/ufs/comp_ice.backend.libcice

@@ -24,6 +24,8 @@ else if (${MACHINE_ID} =~ hera*) then
   setenv ARCH hera_intel
 else if (${MACHINE_ID} =~ wcoss*) then
   setenv ARCH wcoss_dell_p3_intel
+else if (${MACHINE_ID} =~ stampede*) then
+  setenv ARCH stampede_intel
 else
   echo "CICE6 ${0}: ERROR in ARCH setup, ${hname}"
   exit -2

configuration/scripts/machines/Macros.stampede_intel

@@ -0,0 +1,56 @@
+#==============================================================================
+# Makefile macros for TACC stampede, 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   := icc 
+SFC   := ifort
+MPICC := mpiicc
+MPIFC := mpiifort
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC := $(MPIFC)
+  CC := $(MPICC)
+else
+  FC := $(SFC)
+  CC := $(SCC)
+endif
+LD:= $(FC)
+
+NETCDF_PATH := $(NETCDF_ROOT)
+
+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
+