Added renamed Makefile.incs

src/Makefile.inc.geodyncomp.intel.mpich2

+# Define our compilers.................................
+#
+# on geodyncomp, the defaults are OpenMPI (1.4.3), 
+# built with the GNU compilers
+# F90 = mpif90
+# F77 = mpif90
+# cc  = mpicc
+# on geodyncomp, we also have an intel compiler
+F90 = ifort
+F77 = ifort
+cc = icc
+
+# we take the standard ar
+# AR=ar
+AR=xiar
+
+# There are no BITS
+# BITS=-ifort-dbg-openmpi
+BITS=-ifort-mpich2
+# BITS=-ifort-mvapich2
+
+# no MKL
+# IMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/include
+# IMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/include
+# INCLUDE=-I$(IMKL)
+
+# Define MPI include files for ifort.
+# these should match the build of wsmp; see below.
+# for openmpi, these work
+# MPI_INC=-I /opt/openmpi/include
+# MPI_LIB=-L/opt/openmpi/lib -lmpi -lmpi_f77 -lmpi_f90
+# for mpich2
+MPI_INC=-I /opt/mpich2/gnu/include
+MPI_LIB=-L/opt/mpich2/gnu/lib -lmpichf90 -lfmpich -lmpich
+# for mvapich2
+# MPI_INC=-I /usr/lib64/mvapich2/1.4-gcc/include
+# MPI_LIB=-L/usr/lib64/mvapich2/1.4-gcc/lib -lfmpich -lmpich
+
+INCLUDE = $(MPI_INC)
+
+# Define FORTRAN compiler flags.......................
+#
+GFORTRAN_FLAGS = -ffree-line-length-0
+# This gives us, at run time,
+# error while loading shared libraries: libimf.so: cannot open shared object file
+# No such file or directory
+# IFORT_FLAGS = -O2 -fp-model strict -mcmodel=large -shared-intel
+# IFORT_FLAGS = -fast
+IFORT_FLAGS = -O2
+# IFORT_DEBUG = -g -warn all -check all -debug all
+IFORT_DEBUG =
+F90FLAGS = ${IFORT_FLAGS} ${IFORT_DEBUG}
+F77FLAGS = ${IFORT_FLAGS} ${IFORT_DEBUG}
+FFLAGS=${F90FLAGS}
+# Define C compiler flags.............................
+#
+ICC_FLAGS = 
+CFLAGS = -O2 ${ICC_FLAGS}
+
+# no Intel MKL library
+#
+# LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib
+# LMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/lib
+
+# MPI libraries
+# (use the default)
+
+# WSMP Library
+#
+# wsmp, with gnu and openMPI
+# WSMP = -L/opt/wsmp/wsmp-Linux64/lib/GNU/openmpi -lpwsmp64
+# wsmp, with intel and mpich2
+WSMP = -L/opt/wsmp/wsmp-Linux64/lib/Intel/mpich2 -lpwsmp64
+
+# Not using Google's TCMalloc
+# TCML   = /home/dwhipp/software/tcml
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ $(WSMP) -lblas \
+ $(MPI_LIB) \
+ -lpthread
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDE) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDE) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDE) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDE) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1

src/Makefile.inc.geodyncomp.intel.openmpi

+# Define our compilers.................................
+#
+# on geodyncomp, the defaults are OpenMPI (1.4.3), 
+# built with the GNU compilers
+# F90 = mpif90
+# F77 = mpif90
+# cc  = mpicc
+# on geodyncomp, we also have an intel compiler
+F90 = ifort
+F77 = ifort
+cc = icc
+
+# we take the standard ar
+# AR=ar
+AR=xiar
+
+# There are no BITS
+BITS=-ifort-dbg-openmpi
+
+# no MKL
+# IMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/include
+# IMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/include
+# INCLUDE=-I$(IMKL)
+
+# Define MPI include files for ifort.
+# these should match the build of wsmp; see below.
+# for openmpi, these work
+MPI_INC=-I /opt/openmpi/include
+MPI_LIB=-L/opt/openmpi/lib -lmpi -lmpi_f77 -lmpi_f90
+# for mpich2
+# MPI_INC=-I /opt/mpich2/gnu/include
+# MPI_LIB=-L/opt/mpich2/gnu/lib -lmpichf90 -lfmpich -lmpich
+
+INCLUDE = $(MPI_INC)
+
+# Define FORTRAN compiler flags.......................
+#
+GFORTRAN_FLAGS = -ffree-line-length-0
+# This gives us, at run time,
+# error while loading shared libraries: libimf.so: cannot open shared object file
+# No such file or directory
+# IFORT_FLAGS = -O2 -fp-model strict -mcmodel=large -shared-intel
+# IFORT_FLAGS = -fast
+IFORT_FLAGS = -O2
+IFORT_DEBUG = -g -warn all -check all -debug all
+# IFORT_DEBUG =
+F90FLAGS = ${IFORT_FLAGS} ${IFORT_DEBUG}
+F77FLAGS = ${IFORT_FLAGS} ${IFORT_DEBUG}
+FFLAGS=${F90FLAGS}
+# Define C compiler flags.............................
+#
+ICC_FLAGS = 
+CFLAGS = -O2 ${ICC_FLAGS}
+
+# no Intel MKL library
+#
+# LMKL = /scinet/gpc/intel/Compiler/11.1/056/mkl/lib
+# LMKL = /scinet/gpc/intel/Compiler/11.1/072/mkl/lib
+
+# MPI libraries
+# (use the default)
+
+# WSMP Library
+#
+# wsmp, with gnu and openMPI
+WSMP = -L/opt/wsmp/wsmp-Linux64/lib/GNU/openmpi -lpwsmp64
+# wsmp, with intel and mpich2
+# WSMP = -L/opt/wsmp/wsmp-Linux64/lib/Intel/mpich2 -lpwsmp64
+
+# Not using Google's TCMalloc
+# TCML   = /home/dwhipp/software/tcml
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ $(WSMP) -lblas \
+ $(MPI_LIB) \
+ -lpthread
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDE) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDE) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDE) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDE) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1

src/Makefile.inc.placentia.intel.mvapich2

+# Define our compilers.................................
+#
+# MVAPICH2
+MPI_HOME=/home/dwhipp/software/mvapich2-1.5.1p1
+F90    = $(MPI_HOME)/bin/mpif90
+F77    = $(MPI_HOME)/bin/mpif90
+CC     = $(MPI_HOME)/bin/mpicc
+
+AR=xiar
+BITS=
+
+# Intel math kernel
+IMKL = $(MKLROOT)/include
+INCLUDE=-I$(IMKL)
+
+# Define FORTRAN compiler flags.......................
+#
+# For the Intel compiler
+#F90FLAGS  = -O0
+#F77FLAGS  = -O0
+#F90FLAGS  = -O1
+#F77FLAGS  = -O1
+F90FLAGS  = -O2
+F77FLAGS  = -O2
+#F90FLAGS  = -O3
+#F77FLAGS  = -O3
+#F90FLAGS  = -fast
+#F77FLAGS  = -fast
+#F90FLAGS  = -O0 -fp-model strict -g -debug all
+#F77FLAGS  = -O0 -fp-model strict -g -debug all
+#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
+#CFLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
+
+# Libraries................
+
+# Intel MKL libs
+LMKL = $(MKLROOT)/lib
+
+# MPI
+MPI    = -L$(MPI_HOME)/lib -lmpich
+
+#WSMP   = /home/dwhipp/software/wsmp/WSMP-Linux64-OpenMPI
+#WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64_v10.09.16/lib/Intel/openmpi
+WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64_v10.09.16/lib/Intel/mpich2
+#WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64/lib/PGI
+
+# Totalview location for MPI memory debugging
+#TV     = /usr/local/toolworks/totalview/linux-x86-64/lib
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ -L$(WSMP) -lpwsmp64 \
+ -L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \
+  $(MPI) -lpthread
+
+# -L$(TV) -ltvheap_64 \
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1

src/Makefile.inc.placentia.intel.openmpi

+# Define our compilers.................................
+#
+# The default - OpenMPI
+MPI_HOME=/usr/local/openmpi.intel
+F90    = $(MPI_HOME)/bin/mpif90
+F77    = $(MPI_HOME)/bin/mpif90
+CC     = $(MPI_HOME)/bin/mpicc
+
+AR=xiar
+BITS=
+
+# Intel math kernel
+IMKL = $(MKLROOT)/include
+INCLUDE=-I$(IMKL)
+
+# Define FORTRAN compiler flags.......................
+#
+# For the Intel compiler
+#F90FLAGS  = -O0
+#F77FLAGS  = -O0
+#F90FLAGS  = -O1
+#F77FLAGS  = -O1
+#F90FLAGS  = -O2
+#F77FLAGS  = -O2
+#F90FLAGS  = -O3
+#F77FLAGS  = -O3
+F90FLAGS  = -fast
+F77FLAGS  = -fast
+#F90FLAGS  = -O0 -fp-model strict -g -debug all
+#F77FLAGS  = -O0 -fp-model strict -g -debug all
+#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
+#CFLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
+
+# Libraries................
+
+# Intel MKL libs
+LMKL = $(MKLROOT)/lib
+
+# MPI
+MPI    = -L$(MPI_HOME)/lib -lmpi
+
+#WSMP   = /home/dwhipp/software/wsmp/WSMP-Linux64-OpenMPI
+WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64_v10.09.16/lib/Intel/openmpi
+#WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64/lib/PGI
+
+# Totalview location for MPI memory debugging
+#TV     = /usr/local/toolworks/totalview/linux-x86-64/lib
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ -L$(WSMP) -lpwsmp64 \
+ -L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \
+  $(MPI) -lpthread
+
+# -L$(TV) -ltvheap_64 \
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1

src/Makefile.inc.placentia.pgi.openmpi

+# Define our compilers.................................
+#
+# The default - OpenMPI
+MPI_HOME=/usr/local/openmpi
+#MPI_HOME=/home/dwhipp/software/mvapich2-1.4.1
+F90    = $(MPI_HOME)/bin/mpif90
+F77    = $(MPI_HOME)/bin/mpif90
+CC     = $(MPI_HOME)/bin/mpicc
+
+AR=ar
+BITS=
+INCLUDE=
+
+# Define FORTRAN compiler flags.......................
+#
+# For the PGI compiler
+F90FLAGS  = -O0 -Kieee -tp amd64
+F77FLAGS  = -O0 -Kieee -tp amd64
+#F90FLAGS  = -O0 -g -Kieee -tp amd64
+#F77FLAGS  = -O0 -g -Kieee -tp amd64
+#F90FLAGS  = -fast -Mipa=fast,inline -Kieee -tp amd64
+#F77FLAGS  = -fast -Mipa=fast,inline -Kieee -tp amd64
+#F90FLAGS  = -O2 -Kieee -tp amd64
+#F77FLAGS  = -O2 -Kieee -tp amd64
+
+# Define C compiler flags.............................
+#
+CFLAGS  = -O0 -I. -Kieee -tp amd64 
+#CFLAGS  = -O0 -g -I. -Kieee -tp amd64 
+#CFLAGS  = -fast -Mipa=fast,inline -Msmartalloc -I. -Kieee -tp amd64 
+#CFLAGS  = -O2 -I. -Kieee -tp amd64 
+
+# Libraries................
+SCALAPACK  = -L/usr/local/scalapack/lib -lscalapack
+
+# Blacs
+#
+BLACSCINIT = /usr/local/blacs/LIB/blacsCinit_MPI-LINUX-0.a
+BLACSFINIT = /usr/local/blacs/LIB/blacsF77init_MPI-LINUX-0.a
+BLACSL     = /usr/local/blacs/LIB/blacs_MPI-LINUX-0.a
+BLACSC = $(BLACSCINIT) $(BLACSL) $(BLACSCINIT)
+BLACSF = $(BLACSFINIT) $(BLACSL) $(BLACSFINIT)
+BLACS  = $(BLACSC) $(BLACSF)
+# MPI
+#
+MPI    = -L$(MPI_HOME)/lib -lmpi
+#MPI    = -L$(MPI_HOME)/lib -lmpich
+
+WSMP   = /home/dwhipp/software/wsmp/WSMP-Linux64-OpenMPI
+#WSMP   = /home/dwhipp/software/wsmp/wsmp-Linux64/lib/PGI
+
+# Use Google's TCMalloc
+TCML   = /home/dwhipp/software/tcml
+
+# Totalview location for MPI memory debugging
+#TV     = /usr/local/toolworks/totalview/linux-x86-64/lib
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ -L$(TCML) -ltcmalloc_minimal \
+ -L$(TCML) -lstacktrace \
+ -L$(TCML) -lunwind \
+ -L$(WSMP) -lpwsmpOPT64 \
+  $(SCALAPACK) $(BLACS) -lacml $(MPI) -lpthread
+# -L$(TV) -ltvheap_64 \
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1