jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2008-01-09 16:17:21 +00:00
parent 1b6b1b2dcf
commit 6eacb0b5f9
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/neigh_list.cpp
View File

@ -42,7 +42,6 @@ NeighList::NeighList(LAMMPS *lmp, int size) : Pointers(lmp)
dpages = NULL; dpages = NULL;
dnum = 0; dnum = 0;
skip = 0;
iskip = NULL; iskip = NULL;
ijskip = NULL; ijskip = NULL;

1
src/neigh_list.h
View File

@ -44,7 +44,6 @@ class NeighList : protected Pointers {
// atom types to skip when building list // atom types to skip when building list
// iskip,ijskip are just ptrs to corresponding request // 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 *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 int **ijskip; // ijskip[i][j] if pairs of type I,J are not in list

12
src/neighbor.cpp
View File

@ -436,8 +436,8 @@ void Neighbor::init()
// detect lists that are connected to other lists // detect lists that are connected to other lists
// if-then-else sequence is important // if-then-else sequence is important
// since don't want to re-process skip or copy lists further down // 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 // 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 // half_from_full: point this list at preceeding full list
// granhistory: set preceeding list's listgranhistory to this list // granhistory: set preceeding list's listgranhistory to this list
// also set precedding list's ptr to FixShearHistory // also set precedding list's ptr to FixShearHistory
@ -457,14 +457,14 @@ void Neighbor::init()
// ok if parent is copy list // ok if parent is copy list
for (i = 0; i < nlist; i++) { 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]->listskip = lists[requests[i]->otherlist];
lists[i]->copy_skip_info(requests[i]->iskip,requests[i]->ijskip); lists[i]->copy_skip_info(requests[i]->iskip,requests[i]->ijskip);
} else if (requests[i]->copy) } else if (requests[i]->half_from_full)
lists[i]->listcopy = lists[requests[i]->otherlist];
else if (requests[i]->half_from_full)
lists[i]->listfull = lists[i-1]; lists[i]->listfull = lists[i-1];
else if (requests[i]->granhistory) { else if (requests[i]->granhistory) {