Unverified Commit b9bddd7b authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

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

parent 2fa6e913
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -170,13 +170,10 @@ void PairGranular::compute(int eflag, int vflag)
  int *touch,**firsttouch;
  double *history,*allhistory,**firsthistory;

  bool touchflag;

  if (eflag || vflag) ev_setup(eflag,vflag);
  else evflag = vflag_fdotr = 0;
  bool touchflag = false;
  const bool historyupdate = (update->setupflag) ? false : true;

  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