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

src/level/level_operator_fas.cpp

@@ -36 +36 @@
 #include "base/index.hpp"
 #include "comm/comm.hpp"
+#include "grid/grid_index_translations.hpp"
 #include "grid/multigrid.hpp"
 #include "grid/tempgrid.hpp"
@@ -72 +73 @@
   }
 
-  Helper::AssertVectorsEqual(rhs_c_undist.GetSpatialPos(begin_c), rhs_f.GetSpatialPos(begin_f));
-
-  const GridIteratorSet bounds_f(begin_f, end_f);
-  const GridIteratorSet bounds_c(begin_c, end_c);
-
-  assert(bounds_c.Begin().GetEnd()-bounds_c.Begin().GetBegin() == ((bounds_f.Begin().GetEnd()-bounds_f.Begin().GetBegin())-1)/2+1);
+  GridIteratorSet bounds_c, bounds_f;
+  GridIndexTranslations::GetGridAlignment(rhs_c_undist, bounds_c, rhs_f, bounds_f);
 
   const Stencil& op_res = OperatorRestrict();
@@ -157 +154 @@
   }
 
-  Helper::AssertVectorsEqual(sol_c.GetSpatialPos(begin_c), sol_f_undist.GetSpatialPos(begin_f));
-
-  const GridIteratorSet bounds_f(begin_f, end_f);
-  const GridIteratorSet bounds_c(begin_c, end_c);
-
-  assert(bounds_c.Begin().GetEnd()-bounds_c.Begin().GetBegin() == ((bounds_f.Begin().GetEnd()-bounds_f.Begin().GetBegin())-1)/2+1);
-
+  GridIteratorSet bounds_c, bounds_f;
+  GridIndexTranslations::GetGridAlignment(sol_c, bounds_c, sol_f_undist, bounds_f);
 
   comm.CommSubgrid(sol_f_dist, sol_f_undist, 0);