Changeset 9ab682 for src

Timestamp:

Jun 8, 2016, 8:21:02 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

0c9476

Parents:

e480fc

git-author:

Frederik Heber <heber@…> (05/27/16 18:33:31)

git-committer:

Frederik Heber <heber@…> (06/08/16 20:21:02)

Message:

FIX: Made getGridPointsPerAxis() not use pow() in every call.

Location:

src/Fragmentation/Summation/SetValues

Files:

• SamplingGrid.cpp (modified) (2 diffs)
• SamplingGridProperties_inline.hpp (modified) (1 diff)

src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

@@ -436 +436 @@
     size_t *total) const
 {
-  const size_t gridpoints_axis = getGridPointsPerAxis();
   const double round_offset =
       (std::numeric_limits<size_t>::round_style == std::round_toward_zero) ?
@@ -445 +444 @@
       // the grids have to be compatible (equal level), should always be on
       // discrete grid point locations.
-      const double delta = (double)gridpoints_axis/(end[index] - begin[index]);
+      const double delta = getDeltaPerAxis(index);
       // delta is conversion factor from box length to discrete length, i.e. number of points
-      pre_offset[index] = delta*(smaller_wbegin[index] - larger_wbegin[index])+round_offset;
-      length[index] = delta*(smaller_wend[index] - smaller_wbegin[index])+round_offset;
-      post_offset[index] = delta*(larger_wend[index] - smaller_wend[index])+round_offset;
-      total[index] = delta*(larger_wend[index] - larger_wbegin[index])+round_offset;
+      pre_offset[index] = (smaller_wbegin[index] - larger_wbegin[index])/delta+round_offset;
+      length[index] = (smaller_wend[index] - smaller_wbegin[index])/delta+round_offset;
+      post_offset[index] = (larger_wend[index] - smaller_wend[index])/delta+round_offset;
+      total[index] = (larger_wend[index] - larger_wbegin[index])/delta+round_offset;
     } else {
       pre_offset[index] = 0;

src/Fragmentation/Summation/SetValues/SamplingGridProperties_inline.hpp

@@ -42 +42 @@
 const size_t SamplingGridProperties::getGridPointsPerAxis() const
 {
-  return pow(2, level);
+  static size_t s_gridpoints = 1;
+  static int s_level = 0;
+  if (s_level != level) {
+    s_gridpoints = 1 << level;
+    s_level = level;
+  }
+  return s_gridpoints;
 }