From f314fbc9cdba2ff76b1cd85da2e665ade3d193f6 Mon Sep 17 00:00:00 2001
From: stamoor <stamoor@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Fri, 27 Mar 2015 14:56:28 +0000
Subject: [PATCH] Fixing some Kokkos issues

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13310 f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
 src/KOKKOS/pair_coul_cut_kokkos.h  | 9 ++++-----
 src/KOKKOS/pair_coul_dsf_kokkos.h  | 2 +-
 src/KOKKOS/pair_coul_wolf_kokkos.h | 2 +-
 src/KOKKOS/pair_table_kokkos.h     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/KOKKOS/pair_coul_cut_kokkos.h b/src/KOKKOS/pair_coul_cut_kokkos.h
index 03202c4099..29b16d94b8 100644
--- a/src/KOKKOS/pair_coul_cut_kokkos.h
+++ b/src/KOKKOS/pair_coul_cut_kokkos.h
@@ -31,7 +31,7 @@ namespace LAMMPS_NS {
 template<class DeviceType>
 class PairCoulCutKokkos : public PairCoulCut {
  public:
-  enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
+  enum {EnabledNeighFlags=FULL|HALFTHREAD|HALF};
   enum {COUL_FLAG=1};
   typedef DeviceType device_type;
   PairCoulCutKokkos(class LAMMPS *);
@@ -114,13 +114,12 @@ class PairCoulCutKokkos : public PairCoulCut {
   friend class PairComputeFunctor<PairCoulCutKokkos,FULL,true>;
   friend class PairComputeFunctor<PairCoulCutKokkos,HALF,true>;
   friend class PairComputeFunctor<PairCoulCutKokkos,HALFTHREAD,true>;
-  friend class PairComputeFunctor<PairCoulCutKokkos,N2,true>;
-  friend class PairComputeFunctor<PairCoulCutKokkos,FULLCLUSTER,true >;
   friend class PairComputeFunctor<PairCoulCutKokkos,FULL,false>;
   friend class PairComputeFunctor<PairCoulCutKokkos,HALF,false>;
   friend class PairComputeFunctor<PairCoulCutKokkos,HALFTHREAD,false>;
-  friend class PairComputeFunctor<PairCoulCutKokkos,N2,false>;
-  friend class PairComputeFunctor<PairCoulCutKokkos,FULLCLUSTER,false >;
+  friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,FULL,void>(PairCoulCutKokkos*,NeighListKokkos<DeviceType>*);
+  friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,HALF,void>(PairCoulCutKokkos*,NeighListKokkos<DeviceType>*);
+  friend EV_FLOAT pair_compute_neighlist<PairCoulCutKokkos,HALFTHREAD,void>(PairCoulCutKokkos*,NeighListKokkos<DeviceType>*);
   friend EV_FLOAT pair_compute<PairCoulCutKokkos,void>(PairCoulCutKokkos*,
                                                        NeighListKokkos<DeviceType>*);
   friend void pair_virial_fdotr_compute<PairCoulCutKokkos>(PairCoulCutKokkos*);
diff --git a/src/KOKKOS/pair_coul_dsf_kokkos.h b/src/KOKKOS/pair_coul_dsf_kokkos.h
index 7fe68aa10b..342a96d844 100755
--- a/src/KOKKOS/pair_coul_dsf_kokkos.h
+++ b/src/KOKKOS/pair_coul_dsf_kokkos.h
@@ -34,7 +34,7 @@ struct TagPairCoulDSFKernelA{};
 template<class DeviceType>
 class PairCoulDSFKokkos : public PairCoulDSF {
  public:
-  enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
+  enum {EnabledNeighFlags=FULL|HALFTHREAD|HALF};
   enum {COUL_FLAG=1};
   typedef DeviceType device_type;
   typedef EV_FLOAT value_type;
diff --git a/src/KOKKOS/pair_coul_wolf_kokkos.h b/src/KOKKOS/pair_coul_wolf_kokkos.h
index fccfd4bdce..2ae184f351 100755
--- a/src/KOKKOS/pair_coul_wolf_kokkos.h
+++ b/src/KOKKOS/pair_coul_wolf_kokkos.h
@@ -34,7 +34,7 @@ struct TagPairCoulWolfKernelA{};
 template<class DeviceType>
 class PairCoulWolfKokkos : public PairCoulWolf {
  public:
-  enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF};
+  enum {EnabledNeighFlags=FULL|HALFTHREAD|HALF};
   enum {COUL_FLAG=1};
   typedef DeviceType device_type;
   typedef EV_FLOAT value_type;
diff --git a/src/KOKKOS/pair_table_kokkos.h b/src/KOKKOS/pair_table_kokkos.h
index c59a05f866..f497626ba7 100644
--- a/src/KOKKOS/pair_table_kokkos.h
+++ b/src/KOKKOS/pair_table_kokkos.h
@@ -41,7 +41,7 @@ template<class DeviceType>
 class PairTableKokkos : public Pair {
  public:
 
-  enum {EnabledNeighFlags=FULL&HALFTHREAD&HALF&N2&FULLCLUSTER};
+  enum {EnabledNeighFlags=FULL|HALFTHREAD|HALF|N2|FULLCLUSTER};
   enum {COUL_FLAG=0};
   typedef DeviceType device_type;