From 28faf109808ae6aeea31befdf8b0d4113f402229 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Sat, 9 Jul 2016 20:41:21 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15275
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/neigh_list.cpp | 8 ++++++--
src/neigh_list.h | 2 +-
src/neigh_request.h | 24 +++++++++++++++---------
3 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/neigh_list.cpp b/src/neigh_list.cpp
index 21877adbd1..1a65dd2981 100644
--- a/src/neigh_list.cpp
+++ b/src/neigh_list.cpp
@@ -246,11 +246,15 @@ void NeighList::print_attributes()
printf(" %d = half_from_full\n",rq->half_from_full);
printf("\n");
printf(" %d = occasional\n",rq->occasional);
+ printf(" %d = newton\n",rq->newton);
+ printf(" %d = granonesided\n",rq->granonesided);
printf(" %d = dnum\n",rq->dnum);
- printf(" %d = omp\n",rq->omp);
- printf(" %d = intel\n",rq->intel);
printf(" %d = ghost\n",rq->ghost);
printf(" %d = omp\n",rq->omp);
+ printf(" %d = intel\n",rq->intel);
+ printf(" %d = kokkos host\n",rq->kokkos_host);
+ printf(" %d = kokkos device\n",rq->kokkos_device);
+ printf(" %d = ssa\n",rq->ssa);
printf(" %d = copy\n",rq->copy);
printf(" %d = skip\n",rq->skip);
printf(" %d = otherlist\n",rq->otherlist);
diff --git a/src/neigh_list.h b/src/neigh_list.h
index 8941b5bcd6..a268dee468 100644
--- a/src/neigh_list.h
+++ b/src/neigh_list.h
@@ -55,7 +55,7 @@ class NeighList : protected Pointers {
// settings and pointers for related neighbor lists and fixes
- NeighList *listgranhistory; // point at history list
+ NeighList *listgranhistory; // point at list storing shear history
class FixShearHistory *fix_history; // fix that stores history info
int respamiddle; // 1 if this respaouter has middle list
diff --git a/src/neigh_request.h b/src/neigh_request.h
index db1414b08a..d0a8077ae7 100644
--- a/src/neigh_request.h
+++ b/src/neigh_request.h
@@ -27,7 +27,7 @@ class NeighRequest : protected Pointers {
int unprocessed; // 1 when first requested
// 0 after processed by Neighbor class
- // which class is requesting the list, one flag is 1, others are 0
+ // which class style requests the list, one flag is 1, others are 0
int pair; // set by default
int fix;
@@ -35,24 +35,23 @@ class NeighRequest : protected Pointers {
int command;
// kind of list requested, one flag is 1, others are 0
- // set by requesting class
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
-
+ int granhistory; // 1 if history info for granular contact pairs
int respainner; // 1 if a rRESPA inner list
int respamiddle; // 1 if a rRESPA middle list
int respaouter; // 1 if a rRESPA outer list
-
int half_from_full; // 1 if half list computed from previous full list
+ // -----------------
+ // optional settings
+ // -----------------
+
// 0 if needed every reneighboring during run
// 1 if occasionally needed by a fix, compute, etc
- // set by requesting class
int occasional;
@@ -67,8 +66,11 @@ class NeighRequest : protected Pointers {
//int special;
- // number of auxiliary floating point values to store, 0 if none
- // set by requesting class
+ // 1 if one-sided granular list for sphere/surf interactions (gran = 1)
+
+ int granonesided;
+
+ // number of auxiliary floating point values to store, 0 if none set
int dnum;
@@ -109,6 +111,10 @@ class NeighRequest : protected Pointers {
int copy_original;
int otherlist_original;
+ // pointer to FSH class, set by caller
+
+ class FixShearHistory *fix_history; // fix that stores history info
+
// methods
NeighRequest(class LAMMPS *);
--
GitLab