forked from lijiext/lammps
Undid unintended changes from previous check-in on minimize.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2256 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
parent
cb7168f9d3
commit
0d27c1f8a0
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue