Changeset 8180d8 for src/level/level_operator_cs.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/level/level_operator_cs.cpp (modified) (4 diffs)

src/level/level_operator_cs.cpp

@@ -32 +32 @@
 #include "base/index.hpp"
 #include "comm/comm.hpp"
+#include "grid/grid_index_translations.hpp"
 #include "grid/grid_iterator.hpp"
 #include "grid/multigrid.hpp"
@@ -53 +54 @@
   const Stencil& op = OperatorRestrict();
 
-  const Index begin_f_global = rhs_f.Global().LocalSize().Product() > 0
-    ? rhs_f.Global().LocalBegin() + rhs_f.Global().LocalBegin() % 2
-    : rhs_f.Global().LocalBegin();
-  const Index end_f_global = rhs_f.Global().LocalSize().Product() > 0
-    ? rhs_f.Global().LocalEnd() - (rhs_f.Global().LocalEnd() - 1) % 2
-    : rhs_f.Global().LocalBegin();
-
-  Index begin_f = begin_f_global - rhs_f.Global().LocalBegin() + rhs_f.Local().Begin();
-  Index end_f = end_f_global - rhs_f.Global().LocalBegin() + rhs_f.Local().Begin();
-
-  /* Modify fine begin/end to align the points on both levels correctly */
-  if (rhs_c_undist.Global().BoundaryType() == GlobalCoarsened) {
-    begin_f += rhs_f.Local().BoundarySize1();
-    end_f -= rhs_f.Local().BoundarySize2();
-  }
-
-  const Index begin_c = rhs_c_undist.Local().Begin() + begin_f_global / 2 - rhs_c_undist.Global().LocalBegin();
-  const Index end_c = rhs_c_undist.Local().Begin() + end_f_global / 2 - rhs_c_undist.Global().LocalBegin() + 1;
-
-  const GridIteratorSet bounds_f(begin_f, end_f);
-  const GridIteratorSet bounds_c(begin_c, end_c);
+  GridIteratorSet bounds_c, bounds_f;
+  GridIndexTranslations::GetGridAlignment(rhs_c_undist, bounds_c, rhs_f, bounds_f);
 
   assert(bounds_c.Begin().GetEnd()-bounds_c.Begin().GetBegin() == ((bounds_f.Begin().GetEnd()-bounds_f.Begin().GetBegin())-1)/2+1);
@@ -106 +88 @@
   Grid& sol_f_dist = sol(sol.Level()+1);
   Grid& sol_f_undist = comm.GetFinerGrid(sol);
-  Grid& rhs_f_undist = comm.GetFinerGrid(rhs);
 
   const Stencil& op = OperatorProlongate();
 
-  Index begin_f = sol_f_undist.Local().Begin() + 2*sol_c.Global().LocalBegin() - sol_f_undist.Global().LocalBegin();
-  Index end_f = sol_f_undist.Local().End();
-
-  if (sol_c.Global().BoundaryType() == GlobalCoarsened) {
-    begin_f += rhs_f_undist.Local().BoundarySize1();
-    end_f -= rhs_f_undist.Local().BoundarySize2();
-  }
-
-  const GridIteratorSet bounds_f(begin_f, end_f);
-  const GridIteratorSet bounds_c(sol_c.Local().FinerBegin(), sol_c.Local().FinerEnd());
+  GridIteratorSet bounds_c, bounds_f;
+  GridIndexTranslations::GetGridAlignment(sol_c, bounds_c, sol_f_undist, bounds_f);
 
   assert(bounds_c.Begin().GetEnd()-bounds_c.Begin().GetBegin() == ((bounds_f.Begin().GetEnd()-bounds_f.Begin().GetBegin())-1)/2+1);
@@ -132 +105 @@
     for (stencil_iter = op.begin(); stencil_iter != op.end(); ++stencil_iter)
       sol_f_undist(iter_f->X() + stencil_iter->Disp().X(),
-                   iter_f->Y() + stencil_iter->Disp().Y(),
-                   iter_f->Z() + stencil_iter->Disp().Z()) += stencil_iter->Val() * val;
+                   iter_f->Y() + stencil_iter->Disp().Y(),
+                   iter_f->Z() + stencil_iter->Disp().Z()) += stencil_iter->Val() * val;
   }