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

src/grid/tempgrid.cpp

@@ -65 +65 @@
   global.LocalEnd() = size;
   global.LocalSize() = size;
-  global.GlobalFinerBegin() = 0;
-  global.GlobalFinerEnd() = 0;
-  global.GlobalFinerSize() = 0;
-  global.LocalFinerBegin() = 0;
-  global.LocalFinerEnd() = 0;
-  global.LocalFinerSize() = 0;
-  global.GlobalSize() = size;
+  global.GlobalBegin() = 0;
+  global.GlobalEnd() = size;
+  global.GlobalSizeNew() = size;
+  global.GlobalBeginFinest() = 0;
+  global.GlobalEndFinest() = size;
+  global.GlobalSizeFinest() = size;
   global.BoundaryType() = BTUndefined;
 
@@ -90 +89 @@
   local.BoundaryEnd2() = 0;
   local.BoundarySize2() = 0;
-  local.FinerBegin() = 0;
-  local.FinerEnd() = 0;
-  local.FinerSize() = 0;
 
   extent.Begin() = spatial_begin;
@@ -116 +112 @@
   level = grid.Level() + 1;
 
+  global.GlobalBegin() = grid_finer.Global().GlobalBegin();
+  global.GlobalEnd() = grid_finer.Global().GlobalEnd();
+  global.GlobalSizeNew() = grid_finer.Global().GlobalSizeNew();
+
+  global.GlobalBeginFinest() = grid_finer.Global().GlobalBeginFinest();
+  global.GlobalEndFinest() = grid_finer.Global().GlobalEndFinest();
+  global.GlobalSizeFinest() = grid_finer.Global().GlobalSizeFinest();
+
   global.BoundaryType() = grid_finer.Global().BoundaryType();
 
-  global.GlobalFinerBegin() = 0;
-  global.GlobalFinerEnd() = 0;
-  global.GlobalFinerSize() = 0;
-
-  global.LocalFinerBegin() = 0;
-  global.LocalFinerEnd() = 0;
-  global.LocalFinerSize() = 0;
-
-  global.LocalBegin() = 2 * (grid.Global().LocalFinerBegin() - grid.Global().GlobalFinerBegin());
-  global.LocalEnd() = 2 * (grid.Global().LocalFinerEnd() - grid.Global().GlobalFinerBegin() - off) + off;
+  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.LocalSize() = global.LocalEnd() - global.LocalBegin();
 
-  global.GlobalSize() = 2 * (grid.Global().GlobalFinerSize() - off) + off;
-
-  for (int j=0; j<3; ++j) {
-
-    if (boundary[j] == Dirichlet ||
-        boundary[j] == Open) {
-
-      if (grid.Global().BoundaryType() == LocallyRefined) {
-
-        global.GlobalSize()[j] += 2;
-        global.LocalBegin()[j] += 1;
-        global.LocalEnd()[j] +=1;
-
-      } else if (grid.Global().BoundaryType() == GlobalMax) {
-
-        global.GlobalSize()[j] += 2;
-        global.LocalBegin()[j] += 1;
-        global.LocalEnd()[j] +=1;
-
-      }
-
-    } else {
-
-    }
-
-  }
-
-  global.LocalSize() = global.LocalEnd() - global.LocalBegin();
   if (global.LocalSize().Product() == 0) {
     global.LocalBegin() = 0;
@@ -164 +132 @@
     global.BoundaryType() = EmptyGrid;
   }
-
-  local.FinerBegin() = 0;
-  local.FinerEnd() = 0;
-  local.FinerSize() = 0;
 
   local.Begin() = 0;
@@ -234 +198 @@
 
   const Grid& grid_coarser = (*grid.Father())(grid.Level()-1);
-  const Index off = GridIndexTranslations::EndOffset(boundary);
 
   level = grid.Level() - 1;
 
-  global.GlobalFinerBegin() = grid_coarser.Global().GlobalFinerBegin();
-  global.GlobalFinerEnd() = grid_coarser.Global().GlobalFinerEnd();
-  global.GlobalFinerSize() = grid_coarser.Global().GlobalFinerSize();
-
-  global.GlobalSize() = (grid.Global().GlobalSize() - off)/2 + off;
+  global.GlobalBegin() = grid.Global().GlobalBegin();
+  global.GlobalEnd() = grid.Global().GlobalEnd();
+  global.GlobalSizeNew() = grid.Global().GlobalSizeNew();
+
+  global.GlobalBeginFinest() = grid.Global().GlobalBeginFinest();
+  global.GlobalEndFinest() = grid.Global().GlobalEndFinest();
+  global.GlobalSizeFinest() = grid.Global().GlobalSizeFinest();
+
   global.BoundaryType() = grid_coarser.Global().BoundaryType();
 
   global.LocalBegin() = grid.Global().LocalBegin();
   global.LocalEnd() = grid.Global().LocalEnd();
-  GridIndexTranslations::FineToCoarse(global.LocalBegin(), global.LocalEnd());
-
-  global.LocalBegin() += grid_coarser.Global().GlobalFinerBegin();
-  global.LocalEnd() += grid_coarser.Global().GlobalFinerBegin();
-
+  GridIndexTranslations::GlobalFineToCoarse(global.LocalBegin(), global.LocalEnd());
   global.LocalSize() = global.LocalEnd() - global.LocalBegin();
 
@@ -260 +222 @@
     global.BoundaryType() = EmptyGrid;
   }
-
-  global.LocalFinerBegin() = global.LocalBegin();
-  global.LocalFinerEnd() = global.LocalEnd();
-  global.LocalFinerSize() = global.LocalSize();
 
   local.SizeTotal() = global.LocalSize();
@@ -319 +277 @@
   local.BoundarySize2() = local.BoundaryEnd2() - local.BoundaryBegin2();
 
-  local.FinerBegin() = local.Begin();
-  local.FinerEnd() = local.End();
-  local.FinerSize() = local.Size();
-
   Extent().Size() = grid.Extent().Size();
   Extent().Begin() = grid.Extent().Begin();