included non_const version of materialIDs in mesh

and used new version for mat_ids
ufz · Jul 26, 2023 · ae80889 · ae80889
1 parent 0e769c5
commit ae80889
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/MeshLib/Mesh.cpp b/MeshLib/Mesh.cpp
@@ -273,6 +273,12 @@ PropertyVector<int> const* materialIDs(Mesh const& mesh)
     return nullptr;
 }
 
+PropertyVector<int>* materialIDs(Mesh& mesh)
+{
+    return const_cast<PropertyVector<int>*>(
+        MeshLib::materialIDs(std::as_const(mesh)));
+}
+
 PropertyVector<std::size_t> const* bulkNodeIDs(Mesh const& mesh)
 {
     auto const& properties = mesh.getProperties();

diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h
@@ -182,6 +182,7 @@ inline bool operator!=(Mesh const& a, Mesh const& b)
 /// If the property does not exists (or is of different type), a nullptr is
 /// returned.
 PropertyVector<int> const* materialIDs(Mesh const& mesh);
+PropertyVector<int>* materialIDs(Mesh& mesh);
 PropertyVector<std::size_t> const* bulkNodeIDs(Mesh const& mesh);
 PropertyVector<std::size_t> const* bulkElementIDs(Mesh const& mesh);
 

diff --git a/MeshToolsLib/MeshGenerators/AddFaultToVoxelGrid.cpp b/MeshToolsLib/MeshGenerators/AddFaultToVoxelGrid.cpp
@@ -29,7 +29,6 @@
 
 namespace
 {
-static std::string mat_name = "MaterialIDs";
 // tests if a plane and an AABB are intersecting
 // (based on Christer Ericson "Real Time Collision Detection" 5.2.3)
 bool testAABBIntersectingPlane(Eigen::Vector3d const& aabb_centre,
@@ -99,7 +98,7 @@ void markFaults(MeshLib::Mesh& mesh, MeshLib::Mesh const& fault,
 {
     auto const& elems = mesh.getElements();
     std::size_t const n_elems = mesh.getNumberOfElements();
-    auto mat_ids = mesh.getProperties().getPropertyVector<int>("MaterialIDs");
+    auto mat_ids = MeshLib::materialIDs(mesh);
     auto const& fnodes = fault.getNodes();
     auto const& felems = fault.getElements();
     GeoLib::AABB const fault_aabb(fnodes.cbegin(), fnodes.cend());