Cleaned up and updated for latest MPI and compiler versions

src/Makefile.inc.gpc.intel.intelmpi

@@ -5,12 +5,9 @@
 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=xiar
-BITS=_v0.2a-intel_12.1-impi_4.0.2.003
+BITS=_v0.2a-intel_12.1.3-impi_4.0.3.008
 
 #IMKL = /scinet/gpc/intel/ics/composer_xe_2011_sp1.6.233/mkl/include
 IMKL = ${MKL}/include
@@ -19,33 +16,18 @@ INCLUDE=-I$(IMKL)
 # Define FORTRAN compiler flags.......................
 #
 # For the PGI compiler
-#F90FLAGS  = -O0
-#F77FLAGS  = -O0
-#F90FLAGS  = -O1
-#F77FLAGS  = -O1
 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 -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
 
 # Define C compiler flags.............................
 #
-#CFLAGS  = -O0 -I.
-#CFLAGS  = -O1 -I.
 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 -trace
-#CFLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
 
 # Libraries.............................
 
@@ -54,9 +36,10 @@ LMKL = ${MKL}/lib/intel64
 
 # MPI
 #
-MPI    = -L${MPI_HOME}/lib64 -lmpi
+#MPI    = -L${MPI_HOME}/lib64 -lmpi
 
-WSMP = ${HOME}/software/wsmp/wsmp-Linux64-IMPI
+#WSMP = ${HOME}/software/wsmp/wsmp-Linux64-IMPI
+WSMP = ${HOME}/software/wsmp/wsmp-Linux64-Intel_v11.5.20/lib/intelmpi
 
 LIBS = \
  -LOCTREE -lOctree$(BITS) \
@@ -64,9 +47,11 @@ LIBS = \
  -LNN -lnn_c$(BITS) \
  -LCASCADE -lcascade$(BITS) \
  -LRESAMPLE -lresample$(BITS) \
- -L$(WSMP) -lpwsmp64SCI \
+ -L$(WSMP) -lpwsmp64 \
  -L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \
- $(MPI) -lpthread
+ -lpthread
+
+# -L$(WSMP) -lpwsmp64SCI \
 
 # The Makefiles look at compile output with this
 PAGER=more