Changeset c739b3 for src/Fragmentation/Summation/SetValues/SamplingGridProperties.cpp

Timestamp:

Jun 8, 2016, 10:45:27 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

6369bc

Parents:

e34888

git-author:

Frederik Heber <heber@…> (06/06/16 14:28:05)

git-committer:

Frederik Heber <heber@…> (06/08/16 22:45:27)

Message:

Extended SamplingGridProperties::isCompatible() to allow more finely resolved grids, added ::isEquivalent().

• isEquivalent contains the old check and we replaced isCompatible() by it.

File:

• src/Fragmentation/Summation/SetValues/SamplingGridProperties.cpp (modified) (2 diffs)

src/Fragmentation/Summation/SetValues/SamplingGridProperties.cpp

@@ -141 +141 @@
 }
 
-int SamplingGridProperties::getSurplusLevel(const SamplingGridProperties &_props) const
+double SamplingGridProperties::getSurplusLevel(const SamplingGridProperties &_props) const
 {
   static const double log_two = log(2.);
@@ -154 +154 @@
   //!> 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);
+  return surplus_level;
+}
+
+bool SamplingGridProperties::isCompatible(const SamplingGridProperties &_props) const
+{
+  // only equally sized or finer grids are compatible: we only downsample
+  const double surplus_level = getSurplusLevel(_props);
+  if (fabs(surplus_level - round(surplus_level)) > std::numeric_limits<double>::epsilon()*1e4)
+    return false;
+  if (level > (_props.level+surplus_level))
+    return false;
+  // check whether grid point corners coincide
+  for (size_t i=0;i<NDIM;++i) {
+    const double lowercorner = getNearestLowerGridPoint(_props.begin[i], i);
+    if (fabs(lowercorner - _props.begin[i]) > std::numeric_limits<double>::epsilon()*1e4)
+      return false;
+    const double uppercorner = getNearestHigherGridPoint(_props.end[i], i);
+    if (fabs(uppercorner - _props.end[i]) > std::numeric_limits<double>::epsilon()*1e4)
+      return false;
+  }
+  return true;
 }