ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2016-06-08 23:15:55 +00:00
parent 253f93a579
commit 50ac419d3f
12 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neighbor.cpp
View File

@ -625,11 +625,8 @@ void Neighbor::init()
// fix/compute requests:
// whether request is occasional or not doesn't matter
// if request = half and non-skip pair half/respaouter exists,
// become copy of that list if cudable flag matches
// if request = full and non-skip pair full exists,
// become copy of that list if cudable flag matches
// if request = half and non-skip pair full exists,
// become half_from_full of that list if cudable flag matches
// if no matches, do nothing
// fix/compute list will be built independently as needed
// ok if parent is itself a copy list
@ -646,8 +643,6 @@ void Neighbor::init()
if (requests[i]->half && requests[j]->pair &&
requests[j]->skip == 0 && requests[j]->respaouter) break;
}
if (j < nrequest && requests[j]->cudable != requests[i]->cudable)
j = nrequest;
if (j < nrequest) {
requests[i]->copy = 1;
requests[i]->otherlist = j;
@ -658,8 +653,6 @@ void Neighbor::init()
if (requests[i]->half && requests[j]->pair &&
requests[j]->skip == 0 && requests[j]->full) break;
}
if (j < nrequest && requests[j]->cudable != requests[i]->cudable)
j = nrequest;
if (j < nrequest) {
requests[i]->half = 0;
requests[i]->half_from_full = 1;
@ -679,13 +672,11 @@ void Neighbor::init()
// set ptrs to pair_build and stencil_create functions for each list
// ptrs set to NULL if not set explicitly
// also set cudable to 0 if any neigh list request is not cudable
for (i = 0; i < nrequest; i++) {
choose_build(i,requests[i]);
if (style != NSQ) choose_stencil(i,requests[i]);
else stencil_create[i] = NULL;
if (!requests[i]->cudable) cudable = 0;
}
// set each list's build/grow/stencil/ghost flags based on neigh request