Changes in src/linkedcell.cpp [bdc91e:36166d]

File:

• src/linkedcell.cpp (modified) (5 diffs)

src/linkedcell.cpp

@@ -10 +10 @@
 #include "helpers.hpp"
 #include "linkedcell.hpp"
+#include "verbose.hpp"
 #include "log.hpp"
 #include "molecule.hpp"
@@ -187 +188 @@
     N[i] = 0;
   index = -1;
+  max.Zero();
+  min.Zero();
 };
 
@@ -197 +200 @@
   for(int i=0;i<NDIM;i++)
     status = status && ((n[i] >=0) && (n[i] < N[i]));
-//  if (!status)
-//    DoeLog(1) && (eLog()<< Verbose(1) << "indices are out of bounds!" << endl);
+  if (!status)
+  DoeLog(1) && (eLog()<< Verbose(1) << "indices are out of bounds!" << endl);
   return status;
 };
@@ -277 +280 @@
 
 /** Calculates the interval bounds of the linked cell grid.
- * \param lower lower bounds
- * \param upper upper bounds
+ * \param *lower lower bounds
+ * \param *upper upper bounds
  * \param step how deep to check the neighbouring cells (i.e. number of layers to check)
  */
@@ -284 +287 @@
 {
   for (int i=0;i<NDIM;i++) {
-    lower[i] = n[i]-step;
-    if (lower[i] < 0)
-      lower[i] = 0;
-    if (lower[i] >= N[i])
-      lower[i] = N[i]-1;
-    upper[i] = n[i]+step;
-    if (upper[i] >= N[i])
-      upper[i] = N[i]-1;
-    if (upper[i] < 0)
-      upper[i] = 0;
+    lower[i] = n[i];
+    for (int s=step; s>0;--s)
+      if ((n[i]-s) >= 0) {
+        lower[i] = n[i]-s;
+        break;
+      }
+    upper[i] = n[i];
+    for (int s=step; s>0;--s)
+      if ((n[i]+s) < N[i]) {
+        upper[i] = n[i]+s;
+        break;
+      }
     //Log() << Verbose(0) << "axis " << i << " has bounds [" << lower[i] << "," << upper[i] << "]" << endl;
   }