git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@590 f3b2605a-c512-4ea7-a41b-209d697bcdaa

src/MAKE/Makefile.spirit

@@ -1,17 +1,25 @@
 # spirit = HP cluster with dual 3.4 GHz EM64T (64 bit), mpiCC, native MPI, FFTW
 
+# users may wish to add the following (uncommented) to their .bashrc or equivalent: 
+# if [ "$SNLCLUSTER" = "spirit" ]; then
+#   source /opt/modules/default/init/bash
+#   module load libraries/fftw-2.1.5_openmpi-1.2.2_mx_intel-9.1-f040-c045
+# fi;
+
+
 SHELL = /bin/sh
 .IGNORE:
 
 # System-specific settings
 
-FFTW =		/apps/libraries/fftw/nwcc
+FFTW =		/apps/x86_64/libraries/fftw/openmpi-1.2.2_mx_intel-9.1-f040-c045/fftw-2.1.5
 
-CC =		mpiCC
-CCFLAGS =	-O -DFFT_FFTW -I${FFTW}/include
+CC =		mpicxx
+OPTIMIZE =	-O
+CCFLAGS =	$(OPTIMIZE) -DFFT_FFTW -I$(FFTW)/include
 DEPFLAGS =	-M
-LINK =		mpiCC
-LINKFLAGS =	-O -L${FFTW}/lib
+LINK =		mpicxx
+LINKFLAGS =	$(OPTIMIZE) -L$(FFTW)/lib
 USRLIB =	-lfftw -lstdc++
 SYSLIB =	-lm
 SIZE =		size
@@ -34,3 +42,4 @@ $(EXE):	$(OBJ)
 
 DEPENDS = $(OBJ:.o=.d)
 include $(DEPENDS)
+