From d37745fa1b9c9e42449075e5aeb21f75044824d6 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 10 Jun 2014 17:37:48 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12111 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/neigh_request.cpp | 5 ++++- src/neighbor.cpp | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/neigh_request.cpp b/src/neigh_request.cpp index 5937a9e31b..643d11b3bb 100644 --- a/src/neigh_request.cpp +++ b/src/neigh_request.cpp @@ -98,7 +98,10 @@ int NeighRequest::identical(NeighRequest *other) { 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 (id != other->id) same = 0; diff --git a/src/neighbor.cpp b/src/neighbor.cpp index 0d1601a86e..705887ba03 100644 --- a/src/neighbor.cpp +++ b/src/neighbor.cpp @@ -490,7 +490,6 @@ void Neighbor::init() // wait to allocate initial pages until copy lists are detected for (i = 0; i < nrequest; i++) { - requests[i]->unprocessed = 0; if (requests[i]->kokkos_host || requests[i]->kokkos_device) continue; lists[i] = new NeighList(lmp); lists[i]->index = i; @@ -757,9 +756,11 @@ void Neighbor::init() #endif } + // mark all current requests as processed // delete old requests // 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]; memory->sfree(old_requests); old_nrequest = nrequest;