Changeset 6e10f33 for src/grid/grid_index_translations.cpp

Timestamp:

Apr 12, 2013, 8:41:41 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

e5d779b

Parents:

b3075a

Message:

Some work...

File:

• src/grid/grid_index_translations.cpp (modified) (6 diffs)

src/grid/grid_index_translations.cpp

@@ -32 +32 @@
 
 #include "base/helper.hpp"
+#include "comm/comm.hpp"
 #include "grid/grid_double_iterator.hpp"
 #include "grid/grid_index_translations.hpp"
@@ -50 +51 @@
 Index GridIndexTranslations::LocalToGlobal(const Grid& grid, const Index& index_local)
 {
-  return index_local - grid.Local().Begin() + grid.Global().LocalBegin();
+  return index_local - grid.Local().HaloSize1() + grid.Global().LocalBegin();
 }
 
@@ -60 +61 @@
 Index GridIndexTranslations::GlobalToLocal(const Grid& grid, const Index& index_global)
 {
-  return index_global - grid.Global().LocalBegin() + grid.Local().Begin();
+  return index_global - grid.Global().LocalBegin() + grid.Local().HaloSize1();
 }
 
@@ -98 +99 @@
                                              const Grid& grid_2, GridIteratorSet& bounds_2)
 {
+  const Boundary& boundary = MG::GetComm()->BoundaryConditions();
+
   if (grid_1.Level() == grid_2.Level()) {
-    const Index begin_global = grid_1.Global()
-                                     .LocalBegin()
-                                     .Clamp(grid_2.Global().LocalBegin(), grid_2.Global().LocalEnd());
+    Index begin_global = grid_1.Global()
+                               .LocalBegin()
+                               .Clamp(grid_2.Global().LocalBegin(), grid_2.Global().LocalEnd());
 
-    const Index end_global = grid_1.Global()
-                                   .LocalEnd()
-                                   .Clamp(grid_2.Global().LocalBegin(), grid_2.Global().LocalEnd());
+    Index end_global = grid_1.Global()
+                             .LocalEnd()
+                             .Clamp(grid_2.Global().LocalBegin(), grid_2.Global().LocalEnd());
+
+    for (int j=0; j<3; ++j) {
+      if (boundary[j] == Dirichlet || boundary[j] == Open) {
+        if (begin_global[j] == grid_1.Global().GlobalBegin()[j] || begin_global[j] == grid_2.Global().GlobalBegin()[j])
+          begin_global[j] += 1;
+        if (end_global[j] == grid_1.Global().GlobalEnd()[j] || end_global[j] == grid_2.Global().GlobalEnd()[j])
+          end_global[j] -= 1;
+      }
+    }
 
     bounds_1 = GridIteratorSet(GlobalToLocal(grid_1, begin_global), GlobalToLocal(grid_2, end_global));
@@ -128 +140 @@
     }
 
+    for (int j=0; j<3; ++j) {
+      if (boundary[j] == Dirichlet || boundary[j] == Open) {
+        if (grid_1.Global().LocalBegin()[j] == grid_1.Global().GlobalBegin()[j] || grid_2.Global().LocalBegin()[j] == grid_2.Global().GlobalBegin()[j])
+          begin_finest[j] += global_mult;
+        if (grid_1.Global().LocalEnd()[j] == grid_1.Global().GlobalEnd()[j] || grid_2.Global().LocalEnd()[j] == grid_2.Global().GlobalEnd()[j])
+          end_finest[j] -= global_mult;
+      }
+    }
+
     bounds_1 = GridIteratorSet(GlobalFinestToLocal(grid_1, begin_finest), GlobalFinestToLocal(grid_1, end_finest)+1);
     bounds_2 = GridIteratorSet(GlobalFinestToLocal(grid_2, begin_finest), GlobalFinestToLocal(grid_2, end_finest)+1);
@@ -133 +154 @@
   }
 }
+
+void GridIndexTranslations::GetInnerBoundary(const Grid& grid_c, Index& b1_c, Index& b2_c,
+                                             const Grid& grid_f,   Index& b1_f, Index& b2_f)
+{
+  if (grid_f.Global().BoundaryType() == LocallyRefined) {
+
+    const int global_mult = Helper::intpow(2, MG::GetSol()->MaxLevel() - grid_c.Level());
+
+    Index begin_finest = GlobalToGlobalFinest(grid_c, grid_c.Global().LocalBegin())
+                           .Clamp(GlobalToGlobalFinest(grid_f, grid_f.Global().LocalBegin()),
+                                  GlobalToGlobalFinest(grid_f, grid_f.Global().LocalEnd()-1));
+
+    Index end_finest = GlobalToGlobalFinest(grid_c, grid_c.Global().LocalEnd()-1)
+                         .Clamp(GlobalToGlobalFinest(grid_f, grid_f.Global().LocalBegin()),
+                                GlobalToGlobalFinest(grid_f, grid_f.Global().LocalEnd()-1));
+
+  } else {
+    b1_c = -1;
+    b2_c = -1;
+    b1_f = -1;
+    b2_f = -1;
+  }
+}