Undid unintended changes from previous check-in on minimize. (0d27c1f8) · Commits · 郑智淋 / lammps

src/MAKE/Makefile.mac_mpi

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

+2 −2

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

+0 −20

Original line number	Diff line number	Diff line
		/* ----------------------------------------------------------------------
		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