Changeset f57182 for src/grid/tempgrid.cpp

Timestamp:

Mar 30, 2013, 2:44:52 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

8180d8

Parents:

d13e27

git-author:

Julian Iseringhausen <isering@…> (06/11/12 14:02:16)

git-committer:

Julian Iseringhausen <isering@…> (03/30/13 14:44:52)

Message:

Open boundary conditions.

Conflicts:

lib/vmg/src/Makefile.am
lib/vmg/src/base/factory.cpp
lib/vmg/test/unit_test/library/dirichlet_fas_lr_mpi.cpp

File:

• src/grid/tempgrid.cpp (modified) (8 diffs)

src/grid/tempgrid.cpp

@@ -71 +71 @@
   global.LocalFinerEnd() = 0;
   global.LocalFinerSize() = 0;
-  global.FinestAbsBegin() = 0;
-  global.FinestAbsEnd() = size;
-  global.FinestAbsSize() = size;
   global.GlobalSize() = size;
   global.BoundaryType() = BTUndefined;
@@ -113 +110 @@
   const Index off = GridIndexTranslations::EndOffset(boundary);
 
+  /*
+   * Set global grid attributes
+   */
+
   level = grid.Level() + 1;
+
+  global.BoundaryType() = grid_finer.Global().BoundaryType();
 
   global.GlobalFinerBegin() = 0;
@@ -123 +126 @@
   global.LocalFinerSize() = 0;
 
-  global.FinestAbsBegin() = grid_finer.Global().FinestAbsBegin();
-  global.FinestAbsEnd() = grid_finer.Global().FinestAbsEnd();
-  global.FinestAbsSize() = grid_finer.Global().FinestAbsSize();
+  global.LocalBegin() = 2 * (grid.Global().LocalFinerBegin() - grid.Global().GlobalFinerBegin());
+  global.LocalEnd() = 2 * (grid.Global().LocalFinerEnd() - grid.Global().GlobalFinerBegin() - off) + off;
+  global.LocalSize() = global.LocalEnd() - global.LocalBegin();
 
   global.GlobalSize() = 2 * (grid.Global().GlobalFinerSize() - off) + off;
-  global.BoundaryType() = grid_finer.Global().BoundaryType();
-
-  global.LocalBegin() = 2 * grid.Global().LocalBegin().Clamp(grid.Global().GlobalFinerBegin(), grid.Global().GlobalFinerEnd());
-  global.LocalEnd() = 2 * grid.Global().LocalEnd().Clamp(grid.Global().GlobalFinerBegin(), grid.Global().GlobalFinerEnd()) - 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();
@@ -168 +192 @@
     }
 
-    if (grid.Local().BoundarySize1()[i] > 0) {
+    if (grid.Local().BoundarySize1()[i] > 0 && global.BoundaryType() != LocallyRefined) {
+      local.Size()[i] -= grid.Local().BoundarySize1()[i];
       local.Begin()[i] += grid.Local().BoundarySize1()[i];
       local.BoundaryEnd1()[i] = grid.Local().BoundarySize1()[i];
@@ -178 +203 @@
     }
 
-    if (grid.Local().BoundarySize2()[i] > 0) {
+    if (grid.Local().BoundarySize2()[i] > 0 && global.BoundaryType() != LocallyRefined) {
+      local.Size()[i] -= grid.Local().BoundarySize2()[i];
       local.End()[i] -= grid.Local().BoundarySize2()[i];
       local.BoundaryBegin2()[i] = local.End()[i];
-      local.BoundaryEnd2()[i] = local.End()[i]+grid.Local().BoundarySize2()[i];
+      local.BoundaryEnd2()[i] = local.End()[i] + grid.Local().BoundarySize2()[i];
     }
 
@@ -195 +221 @@
     local.BoundarySize1() + local.BoundarySize2();
 
-  extent.Size() = grid.Extent().Size();
-  extent.Begin() = grid.Extent().Begin();
-  extent.End() = grid.Extent().End();
-  extent.MeshWidth() = 0.5 * grid.Extent().MeshWidth();
+  extent = grid_finer.Extent();
 
   iterators.SetSubgrids(local);
@@ -218 +241 @@
   global.GlobalFinerEnd() = grid_coarser.Global().GlobalFinerEnd();
   global.GlobalFinerSize() = grid_coarser.Global().GlobalFinerSize();
-
-  global.FinestAbsBegin() = grid.Global().FinestAbsBegin();
-  global.FinestAbsEnd() = grid.Global().FinestAbsEnd();
-  global.FinestAbsSize() = grid.Global().FinestAbsSize();
 
   global.GlobalSize() = (grid.Global().GlobalSize() - off)/2 + off;
@@ -326 +345 @@
   for (iter=Iterators().Local().Begin(); iter!=Iterators().Local().End(); ++iter)
     (*this)(*iter) = rhs.GetVal(*iter) - prefactor * A.Apply(sol, *iter);
+
+  this->ClearBoundary();
 }