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

src/MAKE/Makefile.liberty_poems_meam

@@ -1,4 +1,4 @@
-# liberty_poems = HP clust w/ dual Xeons, mpiCC, native MPI, FFTW, POEMS lib
+# liberty_poems_meam = HP cluster w/ dual Xeons, mpiCC, native MPI, FFTW, POEMS/MEAM libs
 
 SHELL = /bin/sh
 .IGNORE:
@@ -11,9 +11,10 @@ CC =		mpiCC
 CCFLAGS =	-O -DFFT_FFTW -I${FFTW}/fftw -I/home/sjplimp/lammps/lib/poems
 DEPFLAGS =	-M
 LINK =		mpiCC
-LINKFLAGS =	-O -L${FFTW}/fftw/.libs -L/home/sjplimp/lammps/lib/poems
+LINKFLAGS =	-O -L${FFTW}/fftw/.libs -L/home/sjplimp/lammps/lib/poems \
-USRLIB =	-lfftw -lpoems
+		-L/home/sjplimp/lammps/lib/meam -L/opt/intel/fc/9.0/lib
-SYSLIB =	-lstdc++ -lm
+USRLIB =	-lfftw -lpoems -lmeam
+SYSLIB =	-lstdc++ -lm -lifcore
 SIZE =		size
 
 # Link rule

src/MAKE/Makefile.linux_poems

@@ -1,45 +0,0 @@
-# linux_poems = RedHat Linux box, Intel icc, MPICH, FFTW, POEMS library
-
-SHELL = /bin/sh
-#.IGNORE:
-
-# System-specific settings
-
-CC =		icc
-CCFLAGS =	-O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/lammps/lib/poems \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
-DEPFLAGS =	-M
-LINK =		icc
-LINKFLAGS =	-O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/lammps/lib/poems \
-		-L/home/sjplimp/tools/fftw/lib
-USRLIB =	-lfftw -lmpich -lpoems
-SYSLIB =	-lstdc++ -lcxa -lunwind
-ARCHIVE =	ar
-ARFLAGS =	-rc
-SIZE =		size
-
-# Link target
-
-$(EXE):	$(OBJ)
-	$(LINK) $(LINKFLAGS) $(OBJ) $(USRLIB) $(SYSLIB) -o $(EXE)
-	$(SIZE) $(EXE)
-
-# Library target
-
-lib:	$(OBJ)
-	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
-
-# Compilation rules
-
-%.o:%.cpp
-	$(CC) $(CCFLAGS) -c $<
-
-%.d:%.cpp
-	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@
-
-# Individual dependencies
-
-DEPENDS = $(OBJ:.o=.d)
-include $(DEPENDS)

src/MAKE/Makefile.linux_poems_meam

@@ -1,4 +1,4 @@
-# linux = RedHat Linux box, Intel icc, MPICH, FFTW, MEAM
+# linux_poems_meam = RedHat Linux box, Intel icc, MPICH, FFTW, POEMS & MEAM lib
 
 SHELL = /bin/sh
 #.IGNORE:
@@ -7,15 +7,17 @@ SHELL = /bin/sh
 
 CC =		icc
 CCFLAGS =	-O -I/home/sjplimp/tools/mpich/include \
+		-I/home/sjplimp/lammps/lib/poems \
 		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
 DEPFLAGS =	-M
 LINK =		icc
 LINKFLAGS =	-O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/tools/fftw/lib \
+		-L/home/sjplimp/lammps/lib/poems \
 		-L/home/sjplimp/lammps/lib/meam \
+		-L/home/sjplimp/tools/fftw/lib \
 		-L/opt/intel/fc/9.0/lib
-USRLIB =	-lfftw -lmpich -lmeam
+USRLIB =	-lfftw -lmpich -lpoems -lmeam
-SYSLIB =	-lcxa -lunwind -lstdc++ -lifcore
+SYSLIB =	-lstdc++ -lcxa -lunwind -lifcore
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size

src/MAKE/Makefile.tbird2

@@ -0,0 +1,60 @@
+# tbird = Dell cluster with dual 3.6 GHz Xeons, Intel mpicxx, native MPI, FFTW
+
+SHELL = /bin/sh
+.IGNORE:
+
+# System-specific settings
+
+# Openmpi on tbird does not work correctly with Lammps; mvapich should be used.
+# This is done through module commands.
+# fftw-2.1.5-openmpi-1.1.2-ofed-intel-9.1 can be used,
+#   in spite of openmpi in the name.
+#
+# Before building Lammps on tbird, do the following two module commands:
+#     "module switch mpi mpi/mvapich-0.9.8-ofed-intel-9.1"
+#     "module load libraries/fftw-2.1.5-openmpi-1.1.2-ofed-intel-9.1"
+#
+# Before issuing a mpiexec command for Lammps,
+# the following commands are needed:
+#     "source /opt/modules/3.1.6/init/bash"
+#     "module switch mpi mpi/mvapich-0.9.8-ofed-intel-9.1"
+#     "module load libraries/fftw-2.1.5-openmpi-1.1.2-ofed-intel-9.1" 
+# If bash is not your shell, or the one specified in the script,
+#    substitute the shell name for bash.
+
+CC =		mpicxx
+CCFLAGS =	-O -DFFT_FFTW -I${FFTW_INCLUDE}
+DEPFLAGS =	-M
+LINK =		mpicxx
+LINKFLAGS =	-O -L${FFTW_LIB}
+USRLIB =	-lfftw -lstdc++
+SYSLIB =	-lm
+SIZE =		size
+
+ARCHIVE =       ar
+ARFLAGS =       -rc
+
+# Link rule
+
+$(EXE):	$(OBJ)
+	$(LINK) $(LINKFLAGS) $(OBJ) $(USRLIB) $(SYSLIB) -o $(EXE)
+	$(SIZE) $(EXE)
+
+# Library target
+ 
+lib:    $(OBJ)
+	$(ARCHIVE) $(ARFLAGS) $(EXE) $(OBJ)
+
+
+# Compilation rules
+
+%.o:%.cpp
+	$(CC) $(CCFLAGS) -c $<
+
+%.d:%.cpp
+	$(CC) $(CCFLAGS) $(DEPFLAGS) $< > $@
+
+# Individual dependencies
+
+DEPENDS = $(OBJ:.o=.d)
+include $(DEPENDS)