Unverified Commit 1bd47f03 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1365 from martok/meamc-evclear 

Consolidate clearing of eflags and vflags
parents b055837f b2a7205a

src/ASPHERE/pair_gayberne.cpp

+1 −2
Original line number Diff line number Diff line
@@ -94,8 +94,7 @@ void PairGayBerne::compute(int eflag, int vflag) 
  double *iquat,*jquat;



  evdwl = 0.0;

  if (eflag || vflag) ev_setup(eflag,vflag);

  else evflag = vflag_fdotr = 0;

  ev_init(eflag,vflag);



  AtomVecEllipsoid::Bonus *bonus = avec->bonus;

  int *ellipsoid = atom->ellipsoid;

src/ASPHERE/pair_line_lj.cpp

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ void PairLineLJ::compute(int eflag, int vflag) 
  int *ilist,*jlist,*numneigh,**firstneigh;



  evdwl = 0.0;

  if (eflag || vflag) ev_setup(eflag,vflag);

  else evflag = vflag_fdotr = 0;

  ev_init(eflag,vflag);



  double **x = atom->x;

  double **f = atom->f;

src/ASPHERE/pair_resquared.cpp

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ void PairRESquared::compute(int eflag, int vflag) 
  RE2Vars wi,wj;



  evdwl = 0.0;

  if (eflag || vflag) ev_setup(eflag,vflag);

  else evflag = vflag_fdotr = 0;

  ev_init(eflag,vflag);



  double **x = atom->x;

  double **f = atom->f;

src/ASPHERE/pair_tri_lj.cpp

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ void PairTriLJ::compute(int eflag, int vflag) 
  int *ilist,*jlist,*numneigh,**firstneigh;



  evdwl = 0.0;

  if (eflag || vflag) ev_setup(eflag,vflag);

  else evflag = vflag_fdotr = 0;

  ev_init(eflag,vflag);



  AtomVecTri::Bonus *bonus = avec->bonus;

  double **x = atom->x;

src/BODY/pair_body_nparticle.cpp

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ void PairBodyNparticle::compute(int eflag, int vflag) 
  int *ilist,*jlist,*numneigh,**firstneigh;



  evdwl = 0.0;

  if (eflag || vflag) ev_setup(eflag,vflag);

  else evflag = vflag_fdotr = 0;

  ev_init(eflag,vflag);



  double **x = atom->x;

  double **f = atom->f;

CRA Git | Maintained and supported by SUSTech CRA and CCSE