(fc97de79) · Commits · 郑智淋 / lammps

src/GRANULAR/Install.csh

+12 −12

Original line number	Diff line number	Diff line
		@@ -8,17 +8,17 @@ if ($1 == 1) then
		cp fix_freeze.cpp ..
		cp fix_pour.cpp ..
		cp fix_wall_gran.cpp ..
		cp pair_gran_hertzian.cpp ..
		cp pair_gran_history.cpp ..
		cp pair_gran_no_history.cpp ..
		cp pair_gran_hertz_history.cpp ..
		cp pair_gran_hooke.cpp ..
		cp pair_gran_hooke_history.cpp ..

		cp atom_vec_granular.h ..
		cp fix_freeze.h ..
		cp fix_pour.h ..
		cp fix_wall_gran.h ..
		cp pair_gran_hertzian.h ..
		cp pair_gran_history.h ..
		cp pair_gran_no_history.h ..
		cp pair_gran_hertz_history.h ..
		cp pair_gran_hooke.h ..
		cp pair_gran_hooke_history.h ..

		else if ($1 == 0) then

		@@ -29,16 +29,16 @@ else if ($1 == 0) then
		rm ../fix_freeze.cpp
		rm ../fix_pour.cpp
		rm ../fix_wall_gran.cpp
		rm ../pair_gran_hertzian.cpp
		rm ../pair_gran_history.cpp
		rm ../pair_gran_no_history.cpp
		rm ../pair_gran_hertz_history.cpp
		rm ../pair_gran_hooke.cpp
		rm ../pair_gran_hooke_history.cpp

		rm ../atom_vec_granular.h
		rm ../fix_freeze.h
		rm ../fix_pour.h
		rm ../fix_wall_gran.h
		rm ../pair_gran_hertzian.h
		rm ../pair_gran_history.h
		rm ../pair_gran_no_history.h
		rm ../pair_gran_hertz_history.h
		rm ../pair_gran_hooke.h
		rm ../pair_gran_hooke_history.h

		endif

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#include "math.h"
		#include "stdio.h"
		#include "string.h"
		#include "pair_gran_hertzian.h"
		#include "pair_gran_hertz_history.h"
		#include "atom.h"
		#include "force.h"
		#include "neigh_list.h"
		@@ -30,7 +30,7 @@ using namespace LAMMPS_NS;

		/* ---------------------------------------------------------------------- */

		PairGranHertzian::PairGranHertzian(LAMMPS *lmp) : PairGranHistory(lmp)
		PairGranHertzHistory::PairGranHertzHistory(LAMMPS *lmp) : PairGranHistory(lmp)
		{
		no_virial_compute = 1;
		history = 1;
		@@ -38,7 +38,7 @@ PairGranHertzian::PairGranHertzian(LAMMPS *lmp) : PairGranHistory(lmp)

		/* ---------------------------------------------------------------------- */

		void PairGranHertzian::compute(int eflag, int vflag)
		void PairGranHertzHistory::compute(int eflag, int vflag)
		{
		int i,j,ii,jj,inum,jnum;
		double xtmp,ytmp,ztmp,delx,dely,delz,fx,fy,fz;

+5 −5

Original line number	Diff line number	Diff line
		@@ -11,16 +11,16 @@
		See the README file in the top-level LAMMPS directory.
		------------------------------------------------------------------------- */

		#ifndef PAIR_GRAN_NO_HISTORY_H
		#define PAIR_GRAN_NO_HISTORY_H
		#ifndef PAIR_GRAN_HERTZ_HISTORY_H
		#define PAIR_GRAN_HERTZ_HISTORY_H

		#include "pair_gran_history.h"
		#include "pair_gran_hooke_history.h"

		namespace LAMMPS_NS {

		class PairGranNoHistory : public PairGranHistory {
		class PairGranHertzHistory : public PairGranHookeHistory {
		public:
		PairGranNoHistory(class LAMMPS *);
		PairGranHertzHistory(class LAMMPS *);
		void compute(int, int);
		};

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		#include "math.h"
		#include "stdio.h"
		#include "string.h"
		#include "pair_gran_no_history.h"
		#include "pair_gran_hooke.h"
		#include "atom.h"
		#include "force.h"
		#include "neigh_list.h"
		@@ -30,14 +30,14 @@ using namespace LAMMPS_NS;

		/* ---------------------------------------------------------------------- */

		PairGranNoHistory::PairGranNoHistory(LAMMPS *lmp) : PairGranHistory(lmp)
		PairGranHooke::PairGranHooke(LAMMPS *lmp) : PairGranHistory(lmp)
		{
		history = 0;
		}

		/* ---------------------------------------------------------------------- */

		void PairGranNoHistory::compute(int eflag, int vflag)
		void PairGranHooke::compute(int eflag, int vflag)
		{
		int i,j,ii,jj,inum,jnum;
		double xtmp,ytmp,ztmp,delx,dely,delz,fx,fy,fz;

+5 −5

Original line number	Diff line number	Diff line
		@@ -11,16 +11,16 @@
		See the README file in the top-level LAMMPS directory.
		------------------------------------------------------------------------- */

		#ifndef PAIR_GRAN_HERTZIAN_H
		#define PAIR_GRAN_HERTZIAN_H
		#ifndef PAIR_GRAN_HOOKE_H
		#define PAIR_GRAN_HOOKE_H

		#include "pair_gran_history.h"
		#include "pair_gran_hooke_history.h"

		namespace LAMMPS_NS {

		class PairGranHertzian : public PairGranHistory {
		class PairGranHooke : public PairGranHookeHistory {
		public:
		PairGranHertzian(class LAMMPS *);
		PairGranHooke(class LAMMPS *);
		void compute(int, int);
		};