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@12111 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-06-10 17:37:48 +00:00
parent fcb81d2b48
commit d37745fa1b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/neigh_request.cpp
View File

@ -98,7 +98,10 @@ int NeighRequest::identical(NeighRequest *other)
{ {
int same = 1; int same = 1;
if (unprocessed) same = 0; // set same = 0 if old list was never processed
if (other->unprocessed) same = 0;
if (requestor != other->requestor) same = 0; if (requestor != other->requestor) same = 0;
if (id != other->id) same = 0; if (id != other->id) same = 0;

3
src/neighbor.cpp
View File

@ -490,7 +490,6 @@ void Neighbor::init()
// wait to allocate initial pages until copy lists are detected // wait to allocate initial pages until copy lists are detected
for (i = 0; i < nrequest; i++) { for (i = 0; i < nrequest; i++) {
requests[i]->unprocessed = 0;
if (requests[i]->kokkos_host || requests[i]->kokkos_device) continue; if (requests[i]->kokkos_host || requests[i]->kokkos_device) continue;
lists[i] = new NeighList(lmp); lists[i] = new NeighList(lmp);
lists[i]->index = i; lists[i]->index = i;
@ -757,9 +756,11 @@ void Neighbor::init()
#endif #endif
} }
// mark all current requests as processed
// delete old requests // delete old requests
// copy current requests and style to old for next run // copy current requests and style to old for next run
for (i = 0; i < nrequest; i++) requests[i]->unprocessed = 0;
for (i = 0; i < old_nrequest; i++) delete old_requests[i]; for (i = 0; i < old_nrequest; i++) delete old_requests[i];
memory->sfree(old_requests); memory->sfree(old_requests);
old_nrequest = nrequest; old_nrequest = nrequest;