Commit ad4d2999 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #335 from stanmoore1/neighbor_fixes

Neighbor fixes
parents 83408b19 daf766d4
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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;
+2 −1
Original line number Diff line number Diff line
@@ -909,9 +909,10 @@ void Neighbor::init_pair()
    done = 1;
    for (i = 0; i < npair_perpetual; i++) {
      ptr = NULL;
      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 (lists[plist[i]]->listfull) ptr = lists[plist[i]]->listfull;
      if (ptr == NULL) continue;
      for (m = 0; m < nrequest; m++)
        if (ptr == lists[m]) break;