Changeset e85cfd for src/grid

Timestamp:

Apr 9, 2013, 9:45:13 AM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

0bd47e

Parents:

4a709e

Message:

Work.

Location:

src/grid

Files:

• grid_index_translations.cpp (modified) (6 diffs)
• tempgrid.cpp (modified) (2 diffs)

src/grid/grid_index_translations.cpp

@@ -36 +36 @@
 #include "grid/grid.hpp"
 #include "grid/multigrid.hpp"
+#include "mg.hpp"
 
 using namespace VMG;
@@ -41 +42 @@
 bool GridIndexTranslations::IsGridPointOf(const Grid& grid, const Index& index_finest)
 {
-  assert(grid.Father() != NULL);
-  return index_finest[0] % Helper::intpow(2, grid.Father()->MaxLevel() - grid.Level()) == 0 &&
-         index_finest[1] % Helper::intpow(2, grid.Father()->MaxLevel() - grid.Level()) == 0 &&
-         index_finest[2] % Helper::intpow(2, grid.Father()->MaxLevel() - grid.Level()) == 0;
+  const int max_level = MG::GetSol()->MaxLevel();
+  return index_finest[0] % Helper::intpow(2, max_level - grid.Level()) == 0 &&
+         index_finest[1] % Helper::intpow(2, max_level - grid.Level()) == 0 &&
+         index_finest[2] % Helper::intpow(2, max_level - grid.Level()) == 0;
 }
 
@@ -64 +65 @@
 Index GridIndexTranslations::GlobalToGlobalFinest(const Grid& grid, const Index& index_global)
 {
-  assert(grid.Father() != NULL);
-  return Helper::intpow(2, grid.Father()->MaxLevel() - grid.Level()) * index_global;
+  return Helper::intpow(2, MG::GetSol()->MaxLevel() - grid.Level()) * index_global;
 }
 
@@ -75 +75 @@
 Index GridIndexTranslations::GlobalFinestToGlobal(const Grid& grid, const Index& index_finest)
 {
-  assert(grid.Father() != NULL);
   assert(IsGridPointOf(grid, index_finest));
-  return index_finest / Helper::intpow(2, grid.Father()->MaxLevel() - grid.Level());
+  return index_finest / Helper::intpow(2, MG::GetSol()->MaxLevel() - grid.Level());
 }
 
@@ -97 +96 @@
 
 void GridIndexTranslations::GetGridAlignment(const Grid& grid_1, GridIteratorSet& bounds_1,
-                      const Grid& grid_2, GridIteratorSet& bounds_2)
+                                             const Grid& grid_2, GridIteratorSet& bounds_2)
 {
-  assert(grid_1.Father() != NULL);
-  assert(grid_2.Father() != NULL);
-
   if (grid_1.Level() == grid_2.Level()) {
     const Index begin_global = grid_1.Global()
@@ -117 +113 @@
 
     const Grid& grid_c = (grid_1.Level() < grid_2.Level() ? grid_1 : grid_2);
-    const int global_mult = Helper::intpow(2, grid_c.Father()->MaxLevel() - grid_c.Level());
+    const int global_mult = Helper::intpow(2, MG::GetSol()->MaxLevel() - grid_c.Level());
 
     Index begin_finest = GlobalToGlobalFinest(grid_1, grid_1.Global().LocalBegin())

src/grid/tempgrid.cpp

@@ -104 +104 @@
 
   const Grid& grid_finer = (*grid.Father())(grid.Level()+1);
-  const Index off = GridIndexTranslations::EndOffset(boundary);
 
   /*
@@ -123 +122 @@
 
   global.LocalBegin() = (2*grid.Global().LocalBegin()).Clamp(global.GlobalBegin(), global.GlobalEnd());
-  global.LocalEnd() = (2*(grid.Global().LocalEnd()-off)+off).Clamp(global.GlobalBegin(), global.GlobalEnd());
+  global.LocalEnd() = (2*grid.Global().LocalEnd()).Clamp(global.GlobalBegin(), global.GlobalEnd());
   global.LocalSize() = global.LocalEnd() - global.LocalBegin();