From 85726b7ce22364caa3fc4eff9a1c4bc4a12704a2 Mon Sep 17 00:00:00 2001
From: Stan Moore <stamoor@sandia.gov>
Date: Fri, 14 Oct 2022 14:22:08 -0600
Subject: [PATCH] Optimize FixNeighHistoryKokkos

---
 src/KOKKOS/fix_neigh_history_kokkos.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/KOKKOS/fix_neigh_history_kokkos.cpp b/src/KOKKOS/fix_neigh_history_kokkos.cpp
index 13a0d6f166..ffc569c736 100644
--- a/src/KOKKOS/fix_neigh_history_kokkos.cpp
+++ b/src/KOKKOS/fix_neigh_history_kokkos.cpp
@@ -201,6 +201,9 @@ void FixNeighHistoryKokkos<DeviceType>::post_neighbor()
 
   copymode = 1;
 
+  Kokkos::deep_copy(d_firstflag,0);
+  Kokkos::deep_copy(d_firstvalue,0);
+
   FixNeighHistoryKokkosPostNeighborFunctor<DeviceType> f(this);
   Kokkos::parallel_for(inum,f);
 
@@ -235,16 +238,6 @@ void FixNeighHistoryKokkos<DeviceType>::post_neighbor_item(const int &ii) const
         for (int k = 0; k < dnum; k++) {
           d_firstvalue(i, dnum*jj+k) = d_valuepartner(i, dnum*m+k);
         }
-      } else {
-        d_firstflag(i,jj) = 0;
-        for (int k = 0; k < dnum; k++) {
-          d_firstvalue(i, dnum*jj+k) = 0;
-        }
-      }
-    } else {
-      d_firstflag(i,jj) = 0;
-      for (int k = 0; k < dnum; k++) {
-        d_firstvalue(i, dnum*jj+k) = 0;
       }
     }
   }