MRA: Fix key child computation

Signed-off-by: Joseph Schuchart <[email protected]>
devreal · Sep 17, 2024 · a19fefc · a19fefc
1 parent 50d0bcf
commit a19fefc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/examples/madness/mra-device/key.h b/examples/madness/mra-device/key.h
@@ -102,7 +102,7 @@ namespace mra {
             assert(n<MAX_LEVEL);
             std::array<Translation,NDIM> l = this->l;
             for (auto& x : l) x = 2*x + 1;
-            return Key<NDIM>(2*n, l);
+            return Key<NDIM>(n+1, l);
         }
 
         /// Used by iterator to increment child translation
@@ -126,7 +126,7 @@ namespace mra {
             assert(idx<num_children);
             std::array<Translation,NDIM> l = this->l;
             for (Dimension d = 0; d < NDIM; ++d) l[d] = 2*l[d] + (idx & (1<<d)) ? 1 : 0;
-            return Key<NDIM>(2*n, l);
+            return Key<NDIM>(n+1, l);
         }
     };
     template <> inline SCOPE Key<1> Key<1>::parent(Level generation) const {

diff --git a/examples/madness/mra-device/mrattg-device.cc b/examples/madness/mra-device/mrattg-device.cc
@@ -407,7 +407,7 @@ void test(std::size_t K) {
   D.set_cube(-6.0,6.0);
 
   srand48(5551212); // for reproducible results
-  //for (auto i : range(10000)) drand48(); // warmup generator
+  for (int i = 0; i < range(10000); ++i) drand48(); // warmup generator
 
   ttg::Edge<mra::Key<NDIM>, void> project_control;
   ttg::Edge<mra::Key<NDIM>, mra::FunctionReconstructedNode<T, NDIM>> project_result, reconstruct_result;

diff --git a/examples/mrakey.h b/examples/mrakey.h
@@ -102,7 +102,7 @@ namespace mra {
             assert(n<MAX_LEVEL);
             std::array<Translation,NDIM> l = this->l;
             for (auto& x : l) x = 2*x + 1;
-            return Key<NDIM>(2*n, l);
+            return Key<NDIM>(n+1, l);
         }
 
         /// Used by iterator to increment child translation
@@ -127,7 +127,7 @@ namespace mra {
             assert(idx<NDIM);
             std::array<Translation,NDIM> l = this->l;
             for (auto d : range(NDIM)) l[d] = 2*l[d] + (idx & (1<<d)) ? 1 : 0;
-            return Key<NDIM>(2*n, l);
+            return Key<NDIM>(n+1, l);
         }
     };
     template <> inline Key<1> Key<1>::parent(Level generation) const {