Changeset e34888

Timestamp:

Jun 8, 2016, 9:04:20 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

c739b3

Parents:

f84241

git-author:

Frederik Heber <heber@…> (06/08/16 13:35:18)

git-committer:

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

Message:

Added getSurplusLevel() to SamplingGridProperties.

• FIX: isCompatible() needs to take surplus levels into account when checking for compatibility.

Location:

src/Fragmentation/Summation/SetValues

Files:

• SamplingGridProperties.cpp (modified) (2 diffs)
• SamplingGridProperties.hpp (modified) (1 diff)

src/Fragmentation/Summation/SetValues/SamplingGridProperties.cpp

@@ -40 +40 @@
 
 #include "CodePatterns/MemDebug.hpp"
+
+#include "CodePatterns/Assert.hpp"
 
 #include "Fragmentation/Summation/SetValues/SamplingGridProperties.hpp"
@@ -139 +141 @@
 }
 
+int SamplingGridProperties::getSurplusLevel(const SamplingGridProperties &_props) const
+{
+  static const double log_two = log(2.);
+  const double domain_extent =
+      std::max(getTotalLengthPerAxis(0),
+          std::max(getTotalLengthPerAxis(1),
+              getTotalLengthPerAxis(2)));
+  const double props_extent =
+      std::max(_props.getTotalLengthPerAxis(0),
+          std::max(_props.getTotalLengthPerAxis(1),
+              _props.getTotalLengthPerAxis(2)));
+  //!> states how many more levels we have because of smaller grid (assuming equal levels)
+  const double surplus_level = log(domain_extent/props_extent)/log_two;
+  ASSERT( fabs(surplus_level - round(surplus_level)) < std::numeric_limits<double>::epsilon()*1e4,
+      "SamplingGridProperties::getSurplusLevel() - surplus level is not integer: "
+      +toString(surplus_level));
+  return round(surplus_level);
+}
 
 template<> SamplingGridProperties ZeroInstance<SamplingGridProperties>()

src/Fragmentation/Summation/SetValues/SamplingGridProperties.hpp

@@ -132 +132 @@
       const double value, const size_t axis) const;
 
+  /** Counts how many levels difference there is in grid spacing if we just compare
+   * the extension of \a this and \a _props grid.
+   *
+   * An example: say this is [0,20]^3 and _props is [0,10]^3, while both
+   * have supposedly the same level, then the surplus level of _props is 1
+   * because it has the same number of gridpoints on half the axis length.
+   *
+   * \param _props other grid to compare extension to
+   * \return surplus levels
+   */
+  int getSurplusLevel(const SamplingGridProperties &_props) const;
+
 public:
   //!> offset of grid