From 74b522cae219b9d44ad6da6ca0942b17dc6a013d Mon Sep 17 00:00:00 2001 From: Josh Williams Date: Fri, 7 Jun 2024 10:16:47 +0100 Subject: [PATCH 1/4] rename variable input to IGLToLibMesh --- VacuumMeshing/src/BoundaryGeneration/BoundaryGenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VacuumMeshing/src/BoundaryGeneration/BoundaryGenerator.cpp b/VacuumMeshing/src/BoundaryGeneration/BoundaryGenerator.cpp index 23c572f..9d59700 100644 --- a/VacuumMeshing/src/BoundaryGeneration/BoundaryGenerator.cpp +++ b/VacuumMeshing/src/BoundaryGeneration/BoundaryGenerator.cpp @@ -27,7 +27,7 @@ void BoundaryGenerator::addBoundary(double length, int subdivisions, } // Turn IGL mesh into libmesh Mesh - IGLToLibMesh(boundary_mesh_, boundary_verts, boundary_elems); + IGLToLibMesh(boundary_mesh_, boundary_vertices, boundary_elements); // If unspecified, get merge tolerance if (mesh_merge_tolerance_ == 0) { From 1a4f82ee45e29e3d12c11ca457e508bb71e3ddd1 Mon Sep 17 00:00:00 2001 From: Josh Williams Date: Fri, 7 Jun 2024 10:31:49 +0100 Subject: [PATCH 2/4] fix issue with "surfGen.surface_face_map" is protected --- VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp b/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp index 70408cb..5eddd52 100644 --- a/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp +++ b/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp @@ -69,6 +69,8 @@ class SurfaceMeshGenerator { std::vector &connectivity, std::map> &boundary_data); + std::multimap surface_face_map; + protected: /** Method for checking whether an element has sides which should be in the * skin. Looks at the sides (faces or edges, depends if 2D or 3D element) of @@ -108,7 +110,7 @@ class SurfaceMeshGenerator { /** * */ - std::multimap surface_face_map; + // std::multimap surface_face_map; // Mesh references libMesh::Mesh &mesh, &surfaceMesh; From 7d57022c735bb366de888fec73fb44b7afb3a9ee Mon Sep 17 00:00:00 2001 From: Josh Williams Date: Fri, 7 Jun 2024 10:40:29 +0100 Subject: [PATCH 3/4] fix invalid conversion from const to non-const (surface_face_map) --- VacuumMeshing/include/VacuumGeneration/VacuumGenerator.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VacuumMeshing/include/VacuumGeneration/VacuumGenerator.hpp b/VacuumMeshing/include/VacuumGeneration/VacuumGenerator.hpp index a4b1d65..fba0674 100644 --- a/VacuumMeshing/include/VacuumGeneration/VacuumGenerator.hpp +++ b/VacuumMeshing/include/VacuumGeneration/VacuumGenerator.hpp @@ -64,7 +64,7 @@ class VacuumGenerator { double merge_tolerance_ = 1e-07; double seeding_tolerance_ = 1e-07; - std::multimap* surface_face_map_; + const std::multimap* surface_face_map_; private: }; From c9d915e7c68f788f6c18f77aef279d6d107c22b9 Mon Sep 17 00:00:00 2001 From: Josh Williams Date: Fri, 7 Jun 2024 10:48:31 +0100 Subject: [PATCH 4/4] remove commented code --- VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp b/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp index 5eddd52..0fddce5 100644 --- a/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp +++ b/VacuumMeshing/include/SurfaceMeshing/SurfaceGenerator.hpp @@ -110,7 +110,6 @@ class SurfaceMeshGenerator { /** * */ - // std::multimap surface_face_map; // Mesh references libMesh::Mesh &mesh, &surfaceMesh;