From 49c0f92b0491fbc8ba22aeaef4f47921b225f572 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 23 May 2014 18:17:02 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12022 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/neigh_request.cpp | 1 + src/neigh_request.h | 3 ++- src/pair.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/neigh_request.cpp b/src/neigh_request.cpp index 32317ffe02..5937a9e31b 100644 --- a/src/neigh_request.cpp +++ b/src/neigh_request.cpp @@ -35,6 +35,7 @@ NeighRequest::NeighRequest(LAMMPS *lmp) : Pointers(lmp) half = 1; full = 0; + full_cluster = 0; gran = granhistory = 0; respainner = respamiddle = respaouter = 0; half_from_full = 0; diff --git a/src/neigh_request.h b/src/neigh_request.h index 65a8c6f41e..f41a4017b9 100644 --- a/src/neigh_request.h +++ b/src/neigh_request.h @@ -38,6 +38,7 @@ class NeighRequest : protected Pointers { int half; // 1 if half neigh list (set by default) int full; // 1 if full neigh list + int full_cluster; // only used by Kokkos pair styles int gran; // 1 if granular list int granhistory; // 1 if granular history list @@ -86,7 +87,7 @@ class NeighRequest : protected Pointers { int kokkos_host; int kokkos_device; - + // set by neighbor and pair_hybrid after all requests are made // these settings do not change kind value diff --git a/src/pair.h b/src/pair.h index 399b46ad2c..5dffc4a66a 100644 --- a/src/pair.h +++ b/src/pair.h @@ -183,6 +183,8 @@ class Pair : protected Pointers { protected: enum{GEOMETRIC,ARITHMETIC,SIXTHPOWER}; // mixing options + int special_lj[4]; // copied from force->special_lj for Kokkos + int allocated; // 0/1 = whether arrays are allocated int suffix_flag; // suffix compatibility flag