tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #335 from stanmoore1/neighbor_fixes

Browse Source 
Neighbor fixes
This commit is contained in:
sjplimp
2017-01-17 09:33:25 -07:00
committed by GitHub
parent 83408b195f daf766d4f8
commit ad4d299975
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neigh_request.cpp
View File

@ -139,6 +139,8 @@ int NeighRequest::identical(NeighRequest *other)
if (ghost != other->ghost) same = 0;
if (omp != other->omp) same = 0;
if (intel != other->intel) same = 0;
if (kokkos_host != other->kokkos_host) same = 0;
if (kokkos_device != other->kokkos_device) same = 0;
if (ssa != other->ssa) same = 0;
if (copy != other->copy_original) same = 0;

5
src/neighbor.cpp
View File

@ -909,9 +909,10 @@ void Neighbor::init_pair()
done = 1;
for (i = 0; i < npair_perpetual; i++) {
ptr = NULL;
if (lists[plist[i]]->listcopy) ptr = lists[plist[i]]->listcopy;
if (lists[plist[i]]->listskip) ptr = lists[plist[i]]->listskip;
if (lists[plist[i]]->listfull) ptr = lists[plist[i]]->listfull;
if (lists[plist[i]]->listcopy) ptr = lists[plist[i]]->listcopy;
// listskip check must be after listfull check
if (lists[plist[i]]->listskip) ptr = lists[plist[i]]->listskip;
if (ptr == NULL) continue;
for (m = 0; m < nrequest; m++)
if (ptr == lists[m]) break;