Commit e9dbae35 authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@480 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent d15f2ee3
Loading
Loading
Loading
Loading
+2 −14
Original line number Diff line number Diff line
@@ -92,14 +92,11 @@ void Verlet::init()
  }

  // set flags for what arrays to clear in force_clear()
  // need to clear torques if atom_style is dipole
  // need to clear phia if atom_style is granular
  // need to clear torques if array exists
  // don't need to clear f_pair if atom_style is only granular (no virial)

  torqueflag = 0;
  if (atom->check_style("dipole")) torqueflag = 1;
  granflag = 0;
  if (atom->check_style("granular")) granflag = 1;
  if (atom->torque) torqueflag = 1;
  pairflag = 1;
  if (strcmp(atom->atom_style,"granular") == 0) pairflag = 0;

@@ -309,15 +306,6 @@ void Verlet::force_clear(int vflag)
    }
  }

  if (granflag) {
    double **phia = atom->phia;
    for (i = 0; i < nall; i++) {
      phia[i][0] = 0.0;
      phia[i][1] = 0.0;
      phia[i][2] = 0.0;
    }
  }

  // clear f_pair array if using it this timestep to compute virial

  if (vflag == 2 && pairflag) {
+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class Verlet : public Integrate {
  int *next_fix_virial;             // next timestep they need it
  int triclinic;                    // 0 if domain is orthog, 1 if triclinic

  int pairflag,torqueflag,granflag; // arrays to zero out every step
  int pairflag,torqueflag;          // arrays to zero out every step
  int maxpair;                      // local copies of Update quantities
  double **f_pair;