Changes in src/Filling/Mesh/CubeMesh.cpp [5d81e5:2382d7]

File:

• src/Filling/Mesh/CubeMesh.cpp (modified) (3 diffs)

src/Filling/Mesh/CubeMesh.cpp

@@ -41 +41 @@
 CubeMesh::CubeMesh(const Vector &counts, const Vector &offset, const RealSpaceMatrix &M)
 {
-  RealSpaceMatrix partition;
-  int n[NDIM];
-
 #ifndef NDEBUG
   for (size_t i=0;i<NDIM;++i) {
@@ -49 +46 @@
         "CubeMesh::CubeMesh() - offset coordinates must be in [0,1) but offset["
         +toString(i)+"] is "+toString(offset[i])+".");
-    ASSERT(counts[i] != 0.,
-        "CubeMesh::CubeMesh() - counts["+toString(i)+"] must be != "+toString(counts[i])+".");
+    ASSERT(counts[i] == (int)counts[i],
+        "CubeMesh::CubeMesh() - counts["+toString(i)+"] must be integer: != "+toString(counts[i])+".");
   }
 #endif
+
+  std::vector< unsigned int> size_counts;
+  for (size_t i=0;i<NDIM;++i) {
+    size_counts.push_back( (int)counts[i] );
+  }
+  init(size_counts, offset, M);
+}
+
+/** Constructor for class CubeMesh.
+ *
+ * Here, we generate nodes homogeneously distributed over a cuboid.
+ *
+ * \a offset shifts the coordinates, e.g. if counts = 2, we would set nodes at
+ * 0 and 0.5 with offset = 0 and 0.4999... and 0.9999.. with offset = 0.999...
+ *
+ * @param counts number of points per axis
+ * @param offset offset Vector (coordinates in [0,1))
+ * @param M matrix to transform the default cuboid from (0,0,0) to (1,1,1).
+ */
+CubeMesh::CubeMesh(const std::vector< unsigned int > &counts, const Vector &offset, const RealSpaceMatrix &M)
+{
+  ASSERT(counts.size() == 3,
+      "CubeMesh::CubeMesh() - counts does not have three but "
+      +toString(counts.size())+" entries.");
+
+  init(counts, offset, M);
+}
+
+void CubeMesh::init(const std::vector< unsigned int > &counts, const Vector &offset, const RealSpaceMatrix &M)
+{
+  RealSpaceMatrix partition;
 
   partition.setZero();
@@ -59 +87 @@
   LOG(1, "INFO: partition is " << partition << ".");
 
-
   // go over [0,1]^3 filler grid
+  int n[NDIM];
   for (n[0] = 0; n[0] < counts[0]; n[0]++)
     for (n[1] = 0; n[1] < counts[1]; n[1]++)