Changeset 6e10f33 for src/base/interface.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/base/interface.cpp (modified) (5 diffs)

src/base/interface.cpp

@@ -42 +42 @@
 {
   Index num_cells, size_factor;
-  Index add_node = Index(bc[0]==Periodic ? 0 : 1,
-      bc[1]==Periodic ? 0 : 1,
-          bc[2]==Periodic ? 0 : 1);
+
+  const Index add_node = Index(bc[0]==Periodic ? 0 : 1,
+                               bc[1]==Periodic ? 0 : 1,
+                               bc[2]==Periodic ? 0 : 1);
+
+  const Index inner_boundary = Index(bc[0]==Open ? 2 : 0,
+                                     bc[1]==Open ? 2 : 0,
+                                     bc[2]==Open ? 2 : 0);
+
 
   const Vector box_center = box_offset + 0.5 * box_size;
@@ -66 +72 @@
        num_cells = Helper::intpow(2,levelMax-global.size()+1) * size_factor;
 
-       extent.back().Size() = box_size * static_cast<Vector>(size_factor);
+       extent.back().MeshWidth() = box_size * static_cast<Vector>(size_factor) / num_cells;
+       extent.back().Size() = (num_cells + inner_boundary) * extent.back().MeshWidth();
        extent.back().Begin() = box_center - 0.5 * extent.back().Size();
        extent.back().End() = extent.back().Begin() + extent.back().Size();
-       extent.back().MeshWidth() = extent.back().Size() / num_cells;
 
-       global.back().LocalSize() = num_cells + add_node;
-       global.back().LocalBegin() = -1 * num_cells / 2;
-       global.back().LocalEnd() = num_cells/2 + add_node;
+       global.back().LocalSize() = num_cells + add_node + inner_boundary;
+       global.back().LocalBegin() = -1 * (num_cells + inner_boundary) / 2;
+       global.back().LocalEnd() = (num_cells + inner_boundary) / 2 + add_node;
 
        global.back().GlobalSizeNew() = global.back().LocalSize();
@@ -79 +85 @@
        global.back().GlobalEnd() = global.back().LocalEnd();
 
-       global.back().GlobalSizeFinest() = Helper::intpow(2, global.size()-1)*num_cells + add_node;
-       global.back().GlobalBeginFinest() = -1 * ((Helper::intpow(2, global.size()-1)*num_cells) / 2);
-       global.back().GlobalEndFinest() = (Helper::intpow(2, global.size()-1)*num_cells) / 2 + add_node;
+       global.back().GlobalSizeFinest() = Helper::intpow(2, global.size()-1) * (num_cells+inner_boundary) + add_node;
+       global.back().GlobalBeginFinest() = -1 * ((Helper::intpow(2, global.size()-1) * (num_cells + inner_boundary)) / 2);
+       global.back().GlobalEndFinest() = (Helper::intpow(2, global.size()-1) * (num_cells + inner_boundary)) / 2 + add_node;
+
+
 
        global.back().BoundaryType() = LocallyRefined;
@@ -87 +95 @@
      }
 
-     for (int i=global.size()-1; i>0; --i) {
-       if (global[i].GlobalSizeFinest().Max() > global[i-1].GlobalSizeFinest().Max()) {
-         global[i].BoundaryType() = GlobalMax;
-         break;
-       }else {
-         global[i].BoundaryType() = GlobalCoarsened;
-       }
-     }
+     global.back().BoundaryType() = GlobalMax;
+
    } else {
 
@@ -122 +124 @@
 
    }
-
 
    while (global.back().GlobalSizeNew().Min() > Helper::intpow(2, levelMin)+1) {