diff --git a/src/MAKE/Makefile.mac_mpi b/src/MAKE/Makefile.mac_mpi index 5044f7b88e..8fed823b7e 100755 --- a/src/MAKE/Makefile.mac_mpi +++ b/src/MAKE/Makefile.mac_mpi @@ -9,9 +9,9 @@ FFTW = /sw CC = mpic++ CCFLAGS = -O -MMD -MG -DFFT_FFTW -I${FFTW}/include -DOMPI_SKIP_MPICXX LINK = mpic++ -LINKFLAGS = -O -L${FFTW}/lib -L../../lib/meam -L/sw/lib/gcc4.2/lib +LINKFLAGS = -O -L${FFTW}/lib -USRLIB = -lfftw -lmeam -lgfortran +USRLIB = -lfftw SYSLIB = SIZE = size diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial index f1ea4ca81f..e64c9d708b 100755 --- a/src/MAKE/Makefile.serial +++ b/src/MAKE/Makefile.serial @@ -8,8 +8,8 @@ CC = g++ CCFLAGS = -g -O -I../STUBS -DFFT_NONE DEPFLAGS = -M LINK = g++ -LINKFLAGS = -g -O -L../../lib/meam -USRLIB = ../STUBS/mpi.o -lmeam +LINKFLAGS = -g -O -L../STUBS +USRLIB = -lmpi SYSLIB = ARCHIVE = ar ARFLAGS = -rc diff --git a/src/style.h b/src/style.h index 9d55e7f59d..245e1c5c81 100644 --- a/src/style.h +++ b/src/style.h @@ -148,7 +148,6 @@ DumpStyle(xyz,DumpXYZ) #include "fix_com.h" #include "fix_coord_original.h" #include "fix_deform.h" -#include "fix_deform_prior.h" #include "fix_deposit.h" #include "fix_drag.h" #include "fix_dt_reset.h" @@ -208,7 +207,6 @@ FixStyle(ave/time,FixAveTime) FixStyle(com,FixCOM) FixStyle(coord/original,FixCoordOriginal) FixStyle(deform,FixDeform) -FixStyle(deform_prior,FixDeformPrior) FixStyle(deposit,FixDeposit) FixStyle(drag,FixDrag) FixStyle(dt/reset,FixDtReset) diff --git a/src/style_meam.h b/src/style_meam.h index 221a363f11..e69de29bb2 100644 --- a/src/style_meam.h +++ b/src/style_meam.h @@ -1,20 +0,0 @@ -/* ---------------------------------------------------------------------- - LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator - http://lammps.sandia.gov, Sandia National Laboratories - Steve Plimpton, sjplimp@sandia.gov - - Copyright (2003) Sandia Corporation. Under the terms of Contract - DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains - certain rights in this software. This software is distributed under - the GNU General Public License. - - See the README file in the top-level LAMMPS directory. -------------------------------------------------------------------------- */ - -#ifdef PairInclude -#include "pair_meam.h" -#endif - -#ifdef PairClass -PairStyle(meam,PairMEAM) -#endif