Changeset 13b272 for src

Timestamp:

Apr 14, 2013, 11:45:37 AM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

fb228be

Parents:

14d38c

Message:

Some fixes.

File:

• src/base/interface.cpp (modified) (3 diffs)

src/base/interface.cpp

@@ -59 +59 @@
    if (bc[0] == Open || bc[1] == Open || bc[2] == Open) {
 
+     //TODO: Change this to max_boundary_nodes at one point
      while (global.size() == 0 ||
-         (bc[0] == Open && global.back().GlobalSizeNew()[0] > max_boundary_nodes) ||
-         (bc[1] == Open && global.back().GlobalSizeNew()[1] > max_boundary_nodes) ||
-         (bc[2] == Open && global.back().GlobalSizeNew()[2] > max_boundary_nodes)) {
+         (bc[0] == Open && global.back().GlobalSizeNew()[0] > Helper::intpow(2, levelMin)+1) ||
+         (bc[1] == Open && global.back().GlobalSizeNew()[1] > Helper::intpow(2, levelMin)+1) ||
+         (bc[2] == Open && global.back().GlobalSizeNew()[2] > Helper::intpow(2, levelMin)+1)) {
 
        global.push_back(GlobalIndices());
@@ -70 +71 @@
          size_factor[j] = (bc[j] == Open ? Helper::intpow(2, static_cast<int>(log(pow(alpha, global.size())) / log(2.0) + 1.0)) : 1);
 
-       num_cells = Helper::intpow(2,levelMax-global.size()+1) * size_factor;
+       num_cells = static_cast<Vector>(std::pow(2.0, levelMax-static_cast<int>(global.size())+1)) * size_factor + 0.5;
 
        extent.back().MeshWidth() = box_size * static_cast<Vector>(size_factor) / num_cells;
@@ -88 +89 @@
        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;