From 9239e57d9953363250c74cc8a516b64eb1274d52 Mon Sep 17 00:00:00 2001
From: Dave Whipp <dwhipp@dal.ca>
Date: Thu, 19 Jan 2012 18:16:11 +0000
Subject: [PATCH] Updated for GPC upgrade to Centos 6
---
src/Makefile.inc.gpc.intel.intelmpi | 36 ++++++++++++-----------------
1 file changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/Makefile.inc.gpc.intel.intelmpi b/src/Makefile.inc.gpc.intel.intelmpi
index 2e79d466..896a5ed4 100644
--- a/src/Makefile.inc.gpc.intel.intelmpi
+++ b/src/Makefile.inc.gpc.intel.intelmpi
@@ -1,23 +1,19 @@
# Define our compilers.................................
#
# IntelMPI
-#MPI_HOME=/scinet/gpc/intel/impi/3.2.2.006
-MPI_HOME=/scinet/gpc/intel/impi/4.0.0.027
-#MPI_HOME=/scinet/gpc/intel/impi/4.0.1.007
-F90 = $(MPI_HOME)/bin64/mpif90
-F77 = $(MPI_HOME)/bin64/mpif90
-CC = $(MPI_HOME)/bin64/mpicc
+#MPI_HOME=/scinet/gpc/intel/impi/4.0.2.003
+F90 = ${MPI_HOME}/bin64/mpif90
+F77 = ${MPI_HOME}/bin64/mpif90
+CC = ${MPI_HOME}/bin64/mpicc
#F90 = scalasca -instrument mpif90
#F77 = scalasca -instrument mpif90
#CC = scalasca -instrument mpicc
-#AR=ar
AR=xiar
-BITS=_v0.2a-intel_11.1.072-impi_4.0.0.027
+BITS=_v0.2a-intel_12.1-impi_4.0.2.003
-#IMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/include
-IMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/include
-#IMKL = /scinet/gpc/intel/ics/composerxe/mkl/include
+#IMKL = /scinet/gpc/intel/ics/composer_xe_2011_sp1.6.233/mkl/include
+IMKL = ${MKL}/include
INCLUDE=-I$(IMKL)
# Define FORTRAN compiler flags.......................
@@ -27,16 +23,16 @@ INCLUDE=-I$(IMKL)
#F77FLAGS = -O0
#F90FLAGS = -O1
#F77FLAGS = -O1
-F90FLAGS = -O2
-F77FLAGS = -O2
+F90FLAGS = -O2 -heap-arrays 10
+F77FLAGS = -O2 -heap-arrays 10
#F90FLAGS = -O3
#F77FLAGS = -O3
#F90FLAGS = -fast
#F77FLAGS = -fast
#F90FLAGS = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers
#F77FLAGS = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers
-#F90FLAGS = -O0 -fp-model strict -g -debug all -traceback
-#F77FLAGS = -O0 -fp-model strict -g -debug all -traceback
+#F90FLAGS = -O0 -fp-model strict -g -debug all -traceback -trace
+#F77FLAGS = -O0 -fp-model strict -g -debug all -traceback -trace
#F90FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
#F77FLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
@@ -48,21 +44,19 @@ CFLAGS = -O2 -I.
#CFLAGS = -O3 -I.
#CFLAGS = -fast -I.
#CFLAGS = -O0 -DMKL_ILP64 -I. -fp-model strict -g -debug all
-#CFLAGS = -O0 -I. -fp-model strict -g -debug all -traceback
+#CFLAGS = -O0 -I. -fp-model strict -g -debug all -traceback -trace
#CFLAGS = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
# Libraries.............................
# Intel MKL libs
-#LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib
-LMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/lib
-#LMKL = /scinet/gpc/intel/ics/composerxe/mkl/lib/intel64
+LMKL = ${MKL}/lib/intel64
# MPI
#
-MPI = -L$(MPI_HOME)/lib64 -lmpi
+MPI = -L${MPI_HOME}/lib64 -lmpi
-WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64-IMPI
+WSMP = ${HOME}/software/wsmp/wsmp-Linux64-IMPI
LIBS = \
-LOCTREE -lOctree$(BITS) \
--
GitLab