From edb0fc0def5e9376a098ce9a65aa3c3029b3dbef Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 6 Aug 2014 22:27:06 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12263
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/comm_tiled.cpp | 64 ++++++++++++++++++++++++----------------------
 src/comm_tiled.h   |  1 +
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/comm_tiled.cpp b/src/comm_tiled.cpp
index 531edaaaed..162ef79c11 100644
--- a/src/comm_tiled.cpp
+++ b/src/comm_tiled.cpp
@@ -1023,7 +1023,9 @@ void CommTiled::borders()
 
   for (int iswap = 0; iswap < nswap; iswap++) {
 
-    // find atoms within rectangles using <= and >=
+    // find atoms within rectangles using >= and <
+    // hi test with ">" is important b/c don't want to send an atom
+    //   in lower dim (on boundary) that a proc will recv again in higher dim
     // for x-dim swaps, check owned atoms
     // for yz-dim swaps, check owned and ghost atoms
     // store sent atom indices in list for use in future timesteps
@@ -1982,18 +1984,8 @@ int CommTiled::box_touch_tiled(int proc, int idim, int idir)
 
 int CommTiled::point_drop_brick(int idim, double *x)
 {
-  double deltalo,deltahi;
-
-  if (sublo[idim] == boxlo[idim])
-    deltalo = fabs(x[idim]-prd[idim] - sublo[idim]);
-  else deltalo = fabs(x[idim] - sublo[idim]);
-
-  if (subhi[idim] == boxhi[idim])
-    deltahi = fabs(x[idim]+prd[idim] - subhi[idim]);
-  else deltahi = fabs(x[idim] - subhi[idim]);
-
-  if (deltalo < deltahi) return procneigh[idim][0];
-  return procneigh[idim][1];
+  if (closer_subbox_edge(idim,x)) return procneigh[idim][1];
+  return procneigh[idim][0];
 }
 
 /* ----------------------------------------------------------------------
@@ -2005,33 +1997,19 @@ int CommTiled::point_drop_brick(int idim, double *x)
 
 int CommTiled::point_drop_tiled(int idim, double *x)
 {
-  double deltalo,deltahi;
-
   double xnew[3];
   xnew[0] = x[0]; xnew[1] = x[1]; xnew[2] = x[2];
 
   if (idim == 0) {
     if (xnew[1] < sublo[1] || xnew[1] > subhi[1]) {
-      if (sublo[1] == boxlo[1])
-        deltalo = fabs(x[1]-prd[1] - sublo[1]);
-      else deltalo = fabs(x[1] - sublo[1]);
-      if (subhi[1] == boxhi[1])
-        deltahi = fabs(x[1]+prd[1] - subhi[1]);
-      else deltahi = fabs(x[1] - subhi[1]);
-      if (deltalo < deltahi) xnew[1] = sublo[1];
-      else xnew[1] = subhi[1];
+      if (closer_subbox_edge(1,x)) xnew[1] = subhi[1];
+      else xnew[1] = sublo[1];
     }
   }
   if (idim <= 1) {
     if (xnew[2] < sublo[2] || xnew[2] > subhi[2]) {
-      if (sublo[2] == boxlo[2])
-        deltalo = fabs(x[2]-prd[2] - sublo[2]);
-      else deltalo = fabs(x[2] - sublo[2]);
-      if (subhi[2] == boxhi[2])
-        deltahi = fabs(x[2]+prd[2] - subhi[2]);
-      else deltahi = fabs(x[2] - subhi[2]);
-      if (deltalo < deltahi) xnew[2] = sublo[2];
-      else xnew[2] = subhi[2];
+      if (closer_subbox_edge(2,x)) xnew[2] = subhi[2];
+      else xnew[2] = sublo[2];
     }
   }
 
@@ -2072,6 +2050,10 @@ int CommTiled::point_drop_tiled(int idim, double *x)
   return proc;
 }
 
+/* ----------------------------------------------------------------------
+   recursive form
+------------------------------------------------------------------------- */
+
 int CommTiled::point_drop_tiled_recurse(double *x, 
                                         int proclower, int procupper)
 {
@@ -2095,6 +2077,26 @@ int CommTiled::point_drop_tiled_recurse(double *x,
   else return point_drop_tiled_recurse(x,procmid,procupper);
 }
 
+/* ----------------------------------------------------------------------
+   assume x[idim] is outside subbox bounds in same dim
+------------------------------------------------------------------------- */
+
+int CommTiled::closer_subbox_edge(int idim, double *x)
+{
+  double deltalo,deltahi;
+
+  if (sublo[idim] == boxlo[idim])
+    deltalo = fabs(x[idim]-prd[idim] - sublo[idim]);
+  else deltalo = fabs(x[idim] - sublo[idim]);
+
+  if (subhi[idim] == boxhi[idim])
+    deltahi = fabs(x[idim]+prd[idim] - subhi[idim]);
+  else deltahi = fabs(x[idim] - subhi[idim]);
+
+  if (deltalo < deltahi) return 0;
+  return 1;
+}
+
 /* ----------------------------------------------------------------------
    realloc the size of the send buffer as needed with BUFFACTOR and bufextra
    if flag = 1, realloc
diff --git a/src/comm_tiled.h b/src/comm_tiled.h
index 9c18cbf330..562a416470 100644
--- a/src/comm_tiled.h
+++ b/src/comm_tiled.h
@@ -140,6 +140,7 @@ class CommTiled : public Comm {
   int point_drop_brick(int, double *);
   int point_drop_tiled(int, double *);
   int point_drop_tiled_recurse(double *, int, int);
+  int closer_subbox_edge(int, double *);
 
   void grow_send(int, int);            // reallocate send buffer
   void grow_recv(int);                 // free/allocate recv buffer