jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13070 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2015-02-06 16:19:50 +00:00
parent 1091ba1131
commit c7b1b5d086
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/GRANULAR/pair_gran_hertz_history.cpp
View File

@ -57,7 +57,6 @@ void PairGranHertzHistory::compute(int eflag, int vflag)
if (eflag || vflag) ev_setup(eflag,vflag);
else evflag = vflag_fdotr = 0;
computeflag = 1;
int shearupdate = 1;
if (update->setupflag) shearupdate = 0;

11
src/GRANULAR/pair_gran_hooke_history.cpp
View File

@ -49,7 +49,6 @@ PairGranHookeHistory::PairGranHookeHistory(LAMMPS *lmp) : Pair(lmp)
single_extra = 4;
svector = new double[4];
computeflag = 0;
neighprev = 0;
nmax = 0;
@ -100,7 +99,6 @@ void PairGranHookeHistory::compute(int eflag, int vflag)
if (eflag || vflag) ev_setup(eflag,vflag);
else evflag = vflag_fdotr = 0;
computeflag = 1;
int shearupdate = 1;
if (update->setupflag) shearupdate = 0;
@ -786,15 +784,6 @@ void PairGranHookeHistory::unpack_forward_comm(int n, int first, double *buf)
mass_rigid[i] = buf[m++];
}
/* ---------------------------------------------------------------------- */
void *PairGranHookeHistory::extract(const char *str, int &dim)
{
dim = 0;
if (strcmp(str,"computeflag") == 0) return (void *) &computeflag;
return NULL;
}
/* ----------------------------------------------------------------------
memory usage of local atom-based arrays
------------------------------------------------------------------------- */

3
src/GRANULAR/pair_gran_hooke_history.h
View File

@ -26,8 +26,6 @@ namespace LAMMPS_NS {
class PairGranHookeHistory : public Pair {
public:
int computeflag;
PairGranHookeHistory(class LAMMPS *);
virtual ~PairGranHookeHistory();
virtual void compute(int, int);
@ -44,7 +42,6 @@ class PairGranHookeHistory : public Pair {
virtual double single(int, int, int, int, double, double, double, double &);
int pack_forward_comm(int, int *, double *, int, int *);
void unpack_forward_comm(int, int, double *);
void *extract(const char *, int &);
double memory_usage();
protected: