Changeset c739b3 for src/Fragmentation/Summation/SetValues/SamplingGrid.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/SamplingGrid.cpp (modified) (3 diffs)

src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

@@ -158 +158 @@
 {
   // check that grids are compatible
-  if (isCompatible(other)) {
+  if (isEquivalent(other)) {
     /// get minimum of window
     double min_begin_window[NDIM];
@@ -199 +199 @@
 {
   /// check that grids are compatible
-  if (isCompatible(other)) {
+  if (isEquivalent(other)) {
     /// get maximum of window
     double max_begin_window[NDIM];
@@ -259 +259 @@
 double SamplingGrid::integral(const SamplingGrid &weight) const
 {
-  if (isCompatible(weight)) {
+  if (isEquivalent(weight)) {
     const double volume_element = getVolume()/(double)getTotalGridPoints();
     double int_value = 0.;