refactor: move point data class to ViennaCore

CMakeLists.txt

@@ -111,7 +111,7 @@ include(cmake/vtk.cmake)
 
 CPMAddPackage(
   NAME ViennaCore
-  VERSION 2.1.2
+  VERSION 2.2.1
   GIT_REPOSITORY "https://github.com/ViennaTools/ViennaCore"
   OPTIONS "VIENNACORE_FORMAT_EXCLUDE build/"
   EXCLUDE_FROM_ALL ${VIENNALS_BUILD_PYTHON})

include/viennals/lsCalculateNormalVectors.hpp

@@ -24,7 +24,7 @@ enum class NormalCalculationMethodEnum {
 
 /// This algorithm is used to compute the normal vectors for all points
 /// with level set values <= maxValue (default 0.5). The result is saved in
-/// the lsPointData of the lsDomain and can be retrieved with
+/// the PointData of the lsDomain and can be retrieved with
 /// lsDomain.getPointData().getVectorData("Normals").
 ///
 /// The algorithm uses central differences to compute gradients and normalizes

include/viennals/lsDomain.hpp

@@ -8,9 +8,8 @@
 #include <hrleDomain.hpp>
 #include <hrleFillDomainWithSignedDistance.hpp>
 
-#include <lsPointData.hpp>
-
 #include <vcLogger.hpp>
+#include <vcPointData.hpp>
 #include <vcSmartPointer.hpp>
 #include <vcVectorType.hpp>
 

include/viennals/lsMesh.hpp

@@ -6,8 +6,7 @@
 #include <iostream>
 #include <vector>
 
-#include <lsPointData.hpp>
-
+#include <vcPointData.hpp>
 #include <vcSmartPointer.hpp>
 #include <vcVectorType.hpp>
 
@@ -32,6 +31,9 @@ template <class T = double> class Mesh {
   Vec3D<T> minimumExtent{};
   Vec3D<T> maximumExtent{};
 
+  constexpr static const char *materialIdsLabel = "MaterialIds";
+  constexpr static const char *normalsLabel = "Normals";
+
 private:
   // iterator typedef
   using VectorIt = typename PointData<T>::VectorDataType::iterator;
@@ -99,6 +101,16 @@ template <class T = double> class Mesh {
 
   const PointData<T> &getCellData() const { return cellData; }
 
+  // helper function to get normals
+  std::vector<Vec3D<T>> *getNormals(const char *label = normalsLabel) {
+    return cellData.getVectorData(label);
+  }
+
+  // helper function to get material ids
+  std::vector<T> *getMaterialIds(const char *label = materialIdsLabel) {
+    return cellData.getScalarData(label);
+  }
+
   unsigned insertNextNode(const Vec3D<T> &node) {
     nodes.push_back(node);
     return nodes.size() - 1;
@@ -326,4 +338,4 @@ template <class T = double> class Mesh {
 // add all template specialisations for this class
 PRECOMPILE_PRECISION(Mesh);
 
-} // namespace viennals
+} // namespace viennals