From 9b01eec4369742bc99653487bf8c3bf5030da98d Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sat, 12 Dec 2015 00:33:46 -0500
Subject: [PATCH] no need for atom types in coul/wolf/kk and coul/dsf/kk pair
 styles

---
 src/KOKKOS/pair_coul_dsf_kokkos.cpp  | 5 +----
 src/KOKKOS/pair_coul_dsf_kokkos.h    | 1 -
 src/KOKKOS/pair_coul_wolf_kokkos.cpp | 5 +----
 src/KOKKOS/pair_coul_wolf_kokkos.h   | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/KOKKOS/pair_coul_dsf_kokkos.cpp b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
index f80fe0d38e..f3f1dcad90 100644
--- a/src/KOKKOS/pair_coul_dsf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_dsf_kokkos.cpp
@@ -103,7 +103,6 @@ void PairCoulDSFKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   x = atomKK->k_x.view<DeviceType>();
   f = atomKK->k_f.view<DeviceType>();
   q = atomKK->k_q.view<DeviceType>();
-  type = atomKK->k_type.view<DeviceType>();
   nlocal = atom->nlocal;
   nall = atom->nlocal + atom->nghost;
   newton_pair = force->newton_pair;
@@ -250,7 +249,6 @@ void PairCoulDSFKokkos<DeviceType>::operator()(TagPairCoulDSFKernelA<NEIGHFLAG,N
   const X_FLOAT ytmp = x(i,1);
   const X_FLOAT ztmp = x(i,2);
   const F_FLOAT qtmp = q[i];
-  const int itype = type(i);
 
   if (eflag) {
     const F_FLOAT e_self = -(e_shift/2.0 + alpha/MY_PIS) * qtmp*qtmp*qqrd2e;
@@ -275,7 +273,6 @@ void PairCoulDSFKokkos<DeviceType>::operator()(TagPairCoulDSFKernelA<NEIGHFLAG,N
     const X_FLOAT delx = xtmp - x(j,0);
     const X_FLOAT dely = ytmp - x(j,1);
     const X_FLOAT delz = ztmp - x(j,2);
-    const int jtype = type(j);
     const F_FLOAT rsq = delx*delx + dely*dely + delz*delz;
 
     if (rsq < cut_coulsq) {
@@ -432,4 +429,4 @@ int PairCoulDSFKokkos<DeviceType>::sbmask(const int& j) const {
 template class PairCoulDSFKokkos<LMPDeviceType>;
 #ifdef KOKKOS_HAVE_CUDA
 template class PairCoulDSFKokkos<LMPHostType>;
-#endif
\ No newline at end of file
+#endif
diff --git a/src/KOKKOS/pair_coul_dsf_kokkos.h b/src/KOKKOS/pair_coul_dsf_kokkos.h
index f9bc250557..e50f92c370 100644
--- a/src/KOKKOS/pair_coul_dsf_kokkos.h
+++ b/src/KOKKOS/pair_coul_dsf_kokkos.h
@@ -66,7 +66,6 @@ class PairCoulDSFKokkos : public PairCoulDSF {
   typename ArrayTypes<DeviceType>::t_x_array_randomread x;
   typename ArrayTypes<DeviceType>::t_f_array f;
   typename ArrayTypes<DeviceType>::t_float_1d_randomread q;
-  typename ArrayTypes<DeviceType>::t_int_1d_randomread type;
 
   DAT::tdual_efloat_1d k_eatom;
   DAT::tdual_virial_array k_vatom;
diff --git a/src/KOKKOS/pair_coul_wolf_kokkos.cpp b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
index 4d2804ce0f..d11611468f 100644
--- a/src/KOKKOS/pair_coul_wolf_kokkos.cpp
+++ b/src/KOKKOS/pair_coul_wolf_kokkos.cpp
@@ -104,7 +104,6 @@ void PairCoulWolfKokkos<DeviceType>::compute(int eflag_in, int vflag_in)
   x = atomKK->k_x.view<DeviceType>();
   f = atomKK->k_f.view<DeviceType>();
   q = atomKK->k_q.view<DeviceType>();
-  type = atomKK->k_type.view<DeviceType>();
   nlocal = atom->nlocal;
   nall = atom->nlocal + atom->nghost;
   newton_pair = force->newton_pair;
@@ -251,7 +250,6 @@ void PairCoulWolfKokkos<DeviceType>::operator()(TagPairCoulWolfKernelA<NEIGHFLAG
   const X_FLOAT ytmp = x(i,1);
   const X_FLOAT ztmp = x(i,2);
   const F_FLOAT qtmp = q[i];
-  const int itype = type(i);
 
   if (eflag) {
     const F_FLOAT qisq = qtmp*qtmp;
@@ -277,7 +275,6 @@ void PairCoulWolfKokkos<DeviceType>::operator()(TagPairCoulWolfKernelA<NEIGHFLAG
     const X_FLOAT delx = xtmp - x(j,0);
     const X_FLOAT dely = ytmp - x(j,1);
     const X_FLOAT delz = ztmp - x(j,2);
-    const int jtype = type(j);
     const F_FLOAT rsq = delx*delx + dely*dely + delz*delz;
 
     if (rsq < cut_coulsq) {
@@ -434,4 +431,4 @@ int PairCoulWolfKokkos<DeviceType>::sbmask(const int& j) const {
 template class PairCoulWolfKokkos<LMPDeviceType>;
 #ifdef KOKKOS_HAVE_CUDA
 template class PairCoulWolfKokkos<LMPHostType>;
-#endif
\ No newline at end of file
+#endif
diff --git a/src/KOKKOS/pair_coul_wolf_kokkos.h b/src/KOKKOS/pair_coul_wolf_kokkos.h
index 1efafca99c..bde26c0c3e 100644
--- a/src/KOKKOS/pair_coul_wolf_kokkos.h
+++ b/src/KOKKOS/pair_coul_wolf_kokkos.h
@@ -66,7 +66,6 @@ class PairCoulWolfKokkos : public PairCoulWolf {
   typename ArrayTypes<DeviceType>::t_x_array_randomread x;
   typename ArrayTypes<DeviceType>::t_f_array f;
   typename ArrayTypes<DeviceType>::t_float_1d_randomread q;
-  typename ArrayTypes<DeviceType>::t_int_1d_randomread type;
 
   DAT::tdual_efloat_1d k_eatom;
   DAT::tdual_virial_array k_vatom;