Commit e1f72f6d authored by sjplimp's avatar sjplimp
Browse files 

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

src/ASPHERE/fix_npt_asphere.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ FixNPTAsphere::FixNPTAsphere(LAMMPS *lmp, int narg, char **arg) : 
  FixNPT(lmp, narg, arg)

{

  if (!atom->quat_flag || !atom->angmom_flag || !atom->torque_flag ||

      !atom->avec->shape_type)

      !atom->shape)

    error->all("Fix npt/asphere requires atom attributes "

	       "quat, angmom, torque, shape");

}

src/ASPHERE/fix_nve_asphere.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ FixNVEAsphere::FixNVEAsphere(LAMMPS *lmp, int narg, char **arg) : 
  FixNVE(lmp, narg, arg)

{

  if (!atom->quat_flag || !atom->angmom_flag || !atom->torque_flag ||

      !atom->avec->shape_type)

      !atom->shape)

    error->all("Fix nve/asphere requires atom attributes "

	       "quat, angmom, torque, shape");

  inertia =

src/ASPHERE/fix_nvt_asphere.cpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ FixNVTAsphere::FixNVTAsphere(LAMMPS *lmp, int narg, char **arg) : 
  FixNVT(lmp, narg, arg)

{

  if (!atom->quat_flag || !atom->angmom_flag || !atom->torque_flag ||

      !atom->avec->shape_type)

      !atom->shape)

    error->all("Fix nvt/asphere requires atom attributes "

	       "quat, angmom, torque, shape");

}

src/COLLOID/pair_lubricate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ void PairLubricate::init_style() 
  // insure mono-dispersity

  

  for (int i = 2; i <= atom->ntypes; i++)

    if (atom->shape[i][0] != atom->shape[1][1])

    if (atom->shape[i][0] != atom->shape[1][0])

      error->all("Pair lubricate requires mono-disperse particles");



  int irequest = neighbor->request(this);

src/neighbor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -952,6 +952,7 @@ void Neighbor::build() 
  if (dist_check) {

    double **x = atom->x;

    int nlocal = atom->nlocal;

    if (includegroup) nlocal = atom->nfirst;

    if (nlocal > maxhold) {

      maxhold = atom->nmax;

      memory->destroy_2d_double_array(xhold);

CRA Git | Maintained and supported by SUSTech CRA and CCSE