Changeset 8180d8 for src/solver/solver_singular.cpp

Timestamp:

Apr 5, 2013, 12:39:30 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

4a709e

Parents:

f57182

Message:

Merge stashed open boundary stuff.

File:

• src/solver/solver_singular.cpp (modified) (3 diffs)

src/solver/solver_singular.cpp

@@ -60 +60 @@
 
   // Make sure that arrays are big enough to hold expanded system of equations
-  this->Realloc(rhs.Global().GlobalSize().Product() + 1);
+  this->Realloc(rhs.Global().GlobalSizeNew().Product() + 1);
 
   for (grid_iter = rhs.Iterators().Local().Begin(); grid_iter != rhs.Iterators().Local().End(); ++grid_iter) {
@@ -85 +85 @@
 
       for (int j=0; j<3; ++j)
-        if (comm->BoundaryConditions()[j] == Periodic) {
-          if (i[j] < 0)
-            i[j] += rhs.Global().GlobalSize()[j];
-          else if (i[j] >= rhs.Global().GlobalSize()[j])
-            i[j] -= rhs.Global().GlobalSize()[j];
-        }
+        if (comm->BoundaryConditions()[j] == Periodic) {
+          if (i[j] < rhs.Global().GlobalBegin()[j])
+            i[j] += rhs.Global().GlobalSizeNew()[j];
+          else if (i[j] >= rhs.Global().GlobalEnd()[j])
+            i[j] -= rhs.Global().GlobalSizeNew()[j];
+        }
 
       // Compute global 1-dimensional index
@@ -132 +132 @@
       for (int k=0; k<sol.Local().Size().Z(); k++) {
 
-        // Compute global 1-dimensional index
-        index = sol.GlobalLinearIndex(sol.Global().LocalBegin().X()+i,
-                                      sol.Global().LocalBegin().Y()+j,
-                                      sol.Global().LocalBegin().Z()+k);
+        // Compute global 1-dimensional index
+        index = sol.GlobalLinearIndex(sol.Global().LocalBegin().X() + i,
+                                      sol.Global().LocalBegin().Y() + j,
+                                      sol.Global().LocalBegin().Z() + k);
 
-        // Set solution
-        sol(sol.Local().Begin().X()+i, sol.Local().Begin().Y()+j, sol.Local().Begin().Z()+k) = this->Sol(index) - correction;
+        assert(index >= 0 && index < sol.Global().GlobalSizeNew().Product());
+
+        // Set solution
+        sol(sol.Local().Begin().X()+i, sol.Local().Begin().Y()+j, sol.Local().Begin().Z()+k) = this->Sol(index) - correction;
 
       }