Changeset c805f7 for src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

Timestamp:

Jun 8, 2016, 6:12:12 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

e480fc

Parents:

c9b843

git-author:

Frederik Heber <heber@…> (05/26/16 09:51:07)

git-committer:

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

Message:

FIX: Replaced 3 by NDIM in SamplingGrid which avoids some confusion with numeric grid levels.

File:

• src/Fragmentation/Summation/SetValues/SamplingGrid.cpp (modified) (21 diffs)

src/Fragmentation/Summation/SetValues/SamplingGrid.cpp

@@ -51 +51 @@
 
 // static instances
-const double SamplingGrid::zeroOffset[3] = { 0., 0., 0. };
+const double SamplingGrid::zeroOffset[NDIM] = { 0., 0., 0. };
 
 SamplingGrid::SamplingGrid() :
@@ -61 +61 @@
 }
 
-SamplingGrid::SamplingGrid(const double _begin[3],
-    const double _end[3],
+SamplingGrid::SamplingGrid(const double _begin[NDIM],
+    const double _end[NDIM],
     const int _level) :
   SamplingGridProperties(_begin, _end, _level)
@@ -71 +71 @@
 }
 
-SamplingGrid::SamplingGrid(const double _begin[3],
-    const double _end[3],
+SamplingGrid::SamplingGrid(const double _begin[NDIM],
+    const double _end[NDIM],
     const int _level,
     const sampledvalues_t &_sampled_grid) :
@@ -119 +119 @@
   status &= (static_cast<const SamplingGridProperties &>(*this) ==
       static_cast<const SamplingGridProperties &>(_props));
-  for(size_t i = 0; i<3; ++i) {
+  for(size_t i = 0; i<NDIM; ++i) {
     status &= begin_window[i] == _props.begin_window[i];
     status &= end_window[i] == _props.end_window[i];
@@ -160 +160 @@
   if (isCompatible(other)) {
     /// get minimum of window
-    double min_begin_window[3];
-    double min_end_window[3];
+    double min_begin_window[NDIM];
+    double min_end_window[NDIM];
     bool doShrink = false;
-    for (size_t index=0; index<3;++index) {
+    for (size_t index=0; index<NDIM;++index) {
       if (begin_window[index] <= other.begin_window[index]) {
         min_begin_window[index] = other.begin_window[index];
@@ -201 +201 @@
   if (isCompatible(other)) {
     /// get maximum of window
-    double max_begin_window[3];
-    double max_end_window[3];
+    double max_begin_window[NDIM];
+    double max_end_window[NDIM];
     bool doExtend = false;
-    for (size_t index=0; index<3;++index) {
+    for (size_t index=0; index<NDIM;++index) {
       if (begin_window[index] >= other.begin_window[index]) {
         max_begin_window[index] = other.begin_window[index];
@@ -273 +273 @@
 }
 void SamplingGrid::setWindowSize(
-    const double _begin_window[3],
-    const double _end_window[3])
-{
-  for (size_t index=0;index<3;++index) {
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM])
+{
+  for (size_t index=0;index<NDIM;++index) {
     begin_window[index] = getNearestLowerGridPoint(_begin_window[index], index);
     ASSERT( begin_window[index] >= begin[index],
@@ -289 +289 @@
 
 void SamplingGrid::setWindow(
-    const double _begin_window[3],
-    const double _end_window[3])
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM])
 {
   setWindowSize(_begin_window, _end_window);
@@ -299 +299 @@
 
 void SamplingGrid::setDomain(
-    const double _begin[3],
-    const double _end[3])
+    const double _begin[NDIM],
+    const double _end[NDIM])
 {
   setDomainSize(_begin, _end);
@@ -309 +309 @@
 
 void SamplingGrid::extendWindow(
-    const double _begin_window[3],
-    const double _end_window[3])
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM])
 {
 #ifndef NDEBUG
-  for(size_t index=0;index < 3; ++index) {
+  for(size_t index=0;index < NDIM; ++index) {
     // check that we truly have to extend the window
     ASSERT ( begin_window[index] >= _begin_window[index],
@@ -332 +332 @@
 #endif
   // copy old window size and values
-  double old_begin_window[3];
-  double old_end_window[3];
-  for(size_t index=0;index<3;++index) {
+  double old_begin_window[NDIM];
+  double old_end_window[NDIM];
+  for(size_t index=0;index<NDIM;++index) {
     old_begin_window[index] = begin_window[index];
     old_end_window[index] = end_window[index];
@@ -347 +347 @@
 
 void SamplingGrid::shrinkWindow(
-    const double _begin_window[3],
-    const double _end_window[3])
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM])
 {
 #ifndef NDEBUG
-  for(size_t index=0;index < 3; ++index) {
+  for(size_t index=0;index < NDIM; ++index) {
     // check that we truly have to shrink the window
     ASSERT ( begin_window[index] <= _begin_window[index],
@@ -370 +370 @@
 #endif
   // copy old window size and values
-  double old_begin_window[3];
-  double old_end_window[3];
-  for(size_t index=0;index<3;++index) {
+  double old_begin_window[NDIM];
+  double old_end_window[NDIM];
+  for(size_t index=0;index<NDIM;++index) {
     old_begin_window[index] = begin_window[index];
     old_end_window[index] = end_window[index];
@@ -393 +393 @@
 
 void SamplingGrid::addOntoWindow(
-    const double _begin_window[3],
-    const double _end_window[3],
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM],
     const sampledvalues_t &_sampled_grid,
     const double prefactor)
@@ -410 +410 @@
 
 void SamplingGrid::addIntoWindow(
-    const double _begin_window[3],
-    const double _end_window[3],
+    const double _begin_window[NDIM],
+    const double _end_window[NDIM],
     const sampledvalues_t &_sampled_grid,
     const double prefactor)
@@ -440 +440 @@
       (std::numeric_limits<size_t>::round_style == std::round_toward_zero) ?
           0.5 : 0.; // need offset to get to round_toward_nearest behavior
-  for(size_t index=0;index<3;++index) {
+  for(size_t index=0;index<NDIM;++index) {
     if (fabs(end[index] - begin[index]) > std::numeric_limits<double>::epsilon()*1e4) {
       // we refrain from using floor/ceil as the window's starts and ends,
@@ -465 +465 @@
 
 void SamplingGrid::addWindowOntoWindow(
-    const double larger_wbegin[3],
-    const double larger_wend[3],
-    const double smaller_wbegin[3],
-    const double smaller_wend[3],
+    const double larger_wbegin[NDIM],
+    const double larger_wend[NDIM],
+    const double smaller_wbegin[NDIM],
+    const double smaller_wend[NDIM],
     sampledvalues_t &dest_sampled_grid,
     const sampledvalues_t &source_sampled_grid,
@@ -475 +475 @@
 {
 #ifndef NDEBUG
-  for(size_t index=0;index<3;++index) {
+  for(size_t index=0;index<NDIM;++index) {
     ASSERT( smaller_wbegin[index] >= larger_wbegin[index],
         "SamplingGrid::addWindowOntoWindow() - given smaller window starts earlier than larger window in component "
@@ -485 +485 @@
 #endif
   // the only issue are indices
-  size_t pre_offset[3];
-  size_t post_offset[3];
-  size_t length[3];
-  size_t total[3];
+  size_t pre_offset[NDIM];
+  size_t post_offset[NDIM];
+  size_t length[NDIM];
+  size_t total[NDIM];
   getDiscreteWindowIndices(
       larger_wbegin, larger_wend,
@@ -526 +526 @@
   }
 #endif
-  size_t N[3];
+  size_t N[NDIM];
 //  size_t counter = 0;
   sampledvalues_t::iterator destiter = dest_sampled_grid.begin();
@@ -585 +585 @@
   if (status) {
     // compare windows
-    for (size_t i=0; i<3; ++i) {
+    for (size_t i=0; i<NDIM; ++i) {
       status &= begin_window[i] == other.begin_window[i];
       status &= end_window[i] == other.end_window[i];