Commit 6eacb0b5 authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1358 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 1b6b1b2d
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ NeighList::NeighList(LAMMPS *lmp, int size) : Pointers(lmp)
  dpages = NULL;
  dnum = 0;

  skip = 0;
  iskip = NULL;
  ijskip = NULL;

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ class NeighList : protected Pointers {
  // atom types to skip when building list
  // iskip,ijskip are just ptrs to corresponding request

  int skip;              // 1 if this list skips atom types from another list
  int *iskip;            // iskip[i] if atoms of type I are not in list
  int **ijskip;          // ijskip[i][j] if pairs of type I,J are not in list

+6 −6
Original line number Diff line number Diff line
@@ -436,8 +436,8 @@ void Neighbor::init()
    // detect lists that are connected to other lists
    // if-then-else sequence is important
    //   since don't want to re-process skip or copy lists further down
    // copy: point this list at request->otherlist, could be a skip list
    // skip: point this list at request->otherlist, copy skip info from request
    // copy: point this list at request->otherlist
    // half_from_full: point this list at preceeding full list
    // granhistory: set preceeding list's listgranhistory to this list
    //   also set precedding list's ptr to FixShearHistory
@@ -457,14 +457,14 @@ void Neighbor::init()
    //   ok if parent is copy list

    for (i = 0; i < nlist; i++) {
      if (requests[i]->skip) {
      if (requests[i]->copy)
	lists[i]->listcopy = lists[requests[i]->otherlist];

      else if (requests[i]->skip) {
	lists[i]->listskip = lists[requests[i]->otherlist];
	lists[i]->copy_skip_info(requests[i]->iskip,requests[i]->ijskip);

      } else if (requests[i]->copy)
	lists[i]->listcopy = lists[requests[i]->otherlist];

      else if (requests[i]->half_from_full)
      } else if (requests[i]->half_from_full)
	lists[i]->listfull = lists[i-1];

      else if (requests[i]->granhistory) {