diff --git a/src/MAKE/Makefile.liberty b/src/MAKE/Makefile.liberty index bc2fffeb45..902094a7e9 100755 --- a/src/MAKE/Makefile.liberty +++ b/src/MAKE/Makefile.liberty @@ -7,12 +7,14 @@ SHELL = /bin/sh # Note: this Makefile builds LAMMPS according to what modules you've loaded # by default this is openmpi MPI -# if you want to build with mpich MPI instead, do the following: -# (1) put these lines in your .cshrc -# module switch mpi mpi/mpich-mx-1.2.7..4_intel-10.0-f025-c025 -# module load libraries/fftw-2.1.5_mpich-mx-1.2.7..4_intel-9.1-f040-c046 -# (2) your qsub environment also needs these same modules -# this will occur if you use qsub -V to inherit from your login shell +# you still need this line in your .cshrc to load FFTW +# module load libraries/fftw-2.1.5_openmpi-1.2.3_mx_intel-8.1-f034-c038 +# if you want to build with mpich MPI instead, put this in your .cshrc +# module switch mpi mpi/mpich-mx-1.2.7..4_intel-10.0-f025-c025 +# module load libraries/fftw-2.1.5_mpich-mx-1.2.7..4_intel-9.1-f040-c046 +# whichever mode you build LAMMPS (openmpi or mpich), +# your qsub environment needs these same modules +# this will occur if you use qsub -V to inherit from your login shell #FFTW = /home/sjplimp/fftw/fftw_liberty diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial index 21fab20cf9..2cc6f089de 100755 --- a/src/MAKE/Makefile.serial +++ b/src/MAKE/Makefile.serial @@ -1,16 +1,16 @@ -# serial = RedHat Linux box, icc, no MPI, no FFTs +# serial = RedHat Linux box, g++, no MPI, no FFTs SHELL = /bin/sh # System-specific settings -CC = icc +CC = g++ CCFLAGS = -O -I../STUBS -DFFT_NONE DEPFLAGS = -M -LINK = icc +LINK = g++ LINKFLAGS = -O -L../STUBS -USRLIB = -lmpi -SYSLIB = -lstdc++ +USRLIB = -lmpich +SYSLIB = ARCHIVE = ar ARFLAGS = -rc SIZE = size diff --git a/src/MAKE/Makefile.serial_icc b/src/MAKE/Makefile.serial_icc new file mode 100644 index 0000000000..811b3d4dbb --- /dev/null +++ b/src/MAKE/Makefile.serial_icc @@ -0,0 +1,40 @@ +# serial_icc = RedHat Linux box, icc, no MPI, no FFTs + +SHELL = /bin/sh + +# System-specific settings + +CC = icc +CCFLAGS = -O -I../STUBS -DFFT_NONE +DEPFLAGS = -M +LINK = icc +LINKFLAGS = -O -L../STUBS +USRLIB = -lmpi +SYSLIB = -lstdc++ +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)