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

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.hpp (modified) (15 diffs)

src/Fragmentation/Summation/SetValues/SamplingGrid.hpp

@@ -20 +20 @@
 #include "boost/serialization/export.hpp"
 #include "boost/serialization/vector.hpp"
+
+#include "LinearAlgebra/defs.hpp"
 
 #include "Fragmentation/Summation/SetValues/SamplingGridProperties.hpp"
@@ -51 +53 @@
    * \param _sampled_grid sample points
    */
-  SamplingGrid(const double _begin[3],
-      const double _end[3],
+  SamplingGrid(const double _begin[NDIM],
+      const double _end[NDIM],
       const int _level,
       const sampledvalues_t &_sampled_grid);
@@ -64 +66 @@
    * \param _level number of grid points in \f$2^{\mathrm{level}}\f$
    */
-  SamplingGrid(const double _begin[3],
-      const double _end[3],
+  SamplingGrid(const double _begin[NDIM],
+      const double _end[NDIM],
       const int _level);
 
@@ -211 +213 @@
    * \param _end_window end of window
    */
-  void setWindow(const double _begin_window[3], const double _end_window[3]);
+  void setWindow(const double _begin_window[NDIM], const double _end_window[NDIM]);
 
   /** Helper function to convert begin_window and end_window that are w.r.t.
@@ -255 +257 @@
    * \param _end end of window
    */
-  void setDomain(const double _begin[3], const double _end[3]);
+  void setDomain(const double _begin[NDIM], const double _end[NDIM]);
 
   /** Sets the size of the domain.
@@ -264 +266 @@
    * \param _end end of domain
    */
-  void setDomainSize(const double _begin[3], const double _end[3]);
+  void setDomainSize(const double _begin[NDIM], const double _end[NDIM]);
 
   /** Extends the window while keeping the values.
@@ -271 +273 @@
    * \param _end_window new end of window
    */
-  void extendWindow(const double _begin_window[3], const double _end_window[3]);
+  void extendWindow(const double _begin_window[NDIM], const double _end_window[NDIM]);
 
   /** Shrinks the window while keeping the values.
@@ -278 +280 @@
    * \param _end_window new end of window
    */
-  void shrinkWindow(const double _begin_window[3], const double _end_window[3]);
+  void shrinkWindow(const double _begin_window[NDIM], const double _end_window[NDIM]);
 
   /** Adds another (smaller) window onto the one in this instance.
@@ -290 +292 @@
    */
   void 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);
@@ -305 +307 @@
    */
   void 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);
@@ -334 +336 @@
    */
   void 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,
@@ -360 +362 @@
    * \param _end_window end of window
    */
-  void setWindowSize(const double _begin_window[3], const double _end_window[3]);
+  void setWindowSize(const double _begin_window[NDIM], const double _end_window[NDIM]);
 
 public:
@@ -370 +372 @@
 
   //!> start of the window relative to SamplingGridProperties::begin and SamplingGridProperties::size
-  double begin_window[3];
+  double begin_window[NDIM];
   //!> end of the window relative to SamplingGridProperties::begin and SamplingGridProperties::size
-  double end_window[3];
+  double end_window[NDIM];
 
 private:
@@ -384 +386 @@
     ar & boost::serialization::base_object<SamplingGridProperties>(*this);
     ar & const_cast< sampledvalues_t &>(sampled_grid);
-    for(size_t i=0;i<3;++i) {
+    for(size_t i=0;i<NDIM;++i) {
       ar & begin_window[i];
       ar & end_window[i];
@@ -391 +393 @@
 
   //!> static typedef to use in cstor when no initial values are given
-  static const double zeroOffset[3];
+  static const double zeroOffset[NDIM];
 };