lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

use ev_init() and add some more cosmetic changes to pair granular

This commit is contained in:
Axel Kohlmeyer 2019-03-28 11:47:41 -04:00
parent 2fa6e913ef
commit b9bddd7ba6
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GRANULAR/pair_granular.cpp
View File

@ -170,13 +170,10 @@ void PairGranular::compute(int eflag, int vflag)
int *touch,**firsttouch;
double *history,*allhistory,**firsthistory;
bool touchflag;
bool touchflag = false;
const bool historyupdate = (update->setupflag) ? false : true;
if (eflag || vflag) ev_setup(eflag,vflag);
else evflag = vflag_fdotr = 0;
int historyupdate = 1;
if (update->setupflag) historyupdate = 0;
ev_init(eflag,vflag);
// update rigid body info for owned & ghost atoms if using FixRigid masses
// body[i] = which body atom I is in, -1 if none