Merge pull request #921 from wildmeshing/dzint/remove_lagrange

remove Lagrange

Author: daniel-zint

CMakeLists.txt

@@ -75,7 +75,6 @@ include(onetbb)
 include(mshio)
 include(metis)
 include(gmp)
-include(lagrange)
 include(libigl)
 include(spdlog)
 include(paraviewo)
@@ -134,7 +133,6 @@ target_link_libraries(wildmeshing_toolkit PUBLIC
     TBB::tbb
     mshio::mshio
     metis::metis
-    lagrange::core
     nlohmann_json::nlohmann_json
     nanoflann::nanoflann
     paraviewo::paraviewo

cmake/recipes/lagrange.cmake

@@ -9,28 +9,20 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 #
-
-# MIT
-
 if(TARGET spdlog::spdlog)
     return()
 endif()
 
 message(STATUS "Third-party (external): creating target 'spdlog::spdlog'")
 
-include(FetchContent)
-FetchContent_Declare(
-    spdlog
-    URL https://github.com/gabime/spdlog/archive/refs/tags/v1.9.2.zip
-    URL_HASH MD5=a3d2fb9e5c811ba100380aa82d48f989
+include(CPM)
+CPMAddPackage(
+    NAME spdlog
+    GITHUB_REPOSITORY gabime/spdlog
+    GIT_TAG v1.17.0
 )
 
-option(SPDLOG_INSTALL "Generate the install target" ON)
-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "spdlog")
-FetchContent_MakeAvailable(spdlog)
-
 set_target_properties(spdlog PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
 set_target_properties(spdlog PROPERTIES FOLDER third_party)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR

cmake/recipes/spdlog.cmake

@@ -16,7 +16,7 @@ ExternalProject_Add(
     SOURCE_DIR ${WMTK_DATA_ROOT}
 
     GIT_REPOSITORY https://github.com/wildmeshing/data2.git
-    GIT_TAG f2bd8ed5e8af5a125ee4d92cd0af8f32cec60e02
+    GIT_TAG f21aa84d50a3ac6ffb3b04daf8a3e132b24803b0
 
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""

cmake/wmtk_data.cmake

@@ -29,7 +29,7 @@ set(MY_FLAGS
     -Werror=nonnull
     -Werror=init-self
     -Werror=main
-    -Werror=missing-braces
+    -Werror=no-missing-braces
     -Werror=sequence-point
     -Werror=return-type
     -Werror=trigraphs

cmake/wmtk_warnings.cmake

@@ -251,7 +251,7 @@ bool ImageSimulationMesh::swap_face_before(const Tuple& t)
         const size_t v2 = tt.switch_edge().switch_vertex().vid();
         const size_t v3 = tt.switch_face().switch_edge().switch_vertex().vid();
 
-        std::array<size_t, 3> tri{v0, v1, v2};
+        std::array<size_t, 3> tri{{v0, v1, v2}};
 
         for (auto i = 0; i < 3; i++) {
             std::array<size_t, 4> new_tet = t1_vids;

components/image_simulation/wmtk/components/image_simulation/EdgeSwapping.cpp

@@ -17,8 +17,6 @@
 #include <wmtk/io/read_triangle_mesh.hpp>
 #include <wmtk/utils/InsertTriangleUtils.hpp>
 #include <wmtk/utils/Logger.hpp>
-#include <wmtk/utils/ManifoldUtils.hpp>
-#include <wmtk/utils/Reader.hpp>
 #include <wmtk/utils/io.hpp>
 
 #include <wmtk/components/shortest_edge_collapse/ShortestEdgeCollapse.h>
@@ -55,9 +53,7 @@ std::vector<std::array<size_t, 3>> triangulate_polygon_face(std::vector<wmtk::Ve
                   (b[0] * c[2] - b[2] * c[0]) != 0))) {
                 no_colinear = false;
                 std::array<size_t, 3> t = {
-                    size_t(cur.second),
-                    size_t(next.second),
-                    size_t(nextnext.second)};
+                    {size_t(cur.second), size_t(next.second), size_t(nextnext.second)}};
                 triangulated_faces.push_back(t);
                 points_vector.erase(points_vector.begin() + ((i + 1) % points_vector.size()));
                 break;
@@ -74,9 +70,9 @@ std::vector<std::array<size_t, 3>> triangulate_polygon_face(std::vector<wmtk::Ve
     // cleanup convex polygon
     while (points_vector.size() >= 3) {
         std::array<size_t, 3> t = {
-            size_t(points_vector[0].second),
-            size_t(points_vector[1].second),
-            size_t(points_vector[points_vector.size() - 1].second)};
+            {size_t(points_vector[0].second),
+             size_t(points_vector[1].second),
+             size_t(points_vector[points_vector.size() - 1].second)}};
         triangulated_faces.push_back(t);
         points_vector.erase(points_vector.begin());
     }
@@ -327,9 +323,7 @@ void embed_surface(
         if (polygon_face.size() == 3) {
             // already a triangle
             std::array<size_t, 3> triangle_face = {
-                polygon_face[0],
-                polygon_face[1],
-                polygon_face[2]};
+                {polygon_face[0], polygon_face[1], polygon_face[2]}};
             int idx = triangulated_faces.size();
             triangulated_faces.push_back(triangle_face);
             if (polygon_faces_on_input_surface[i]) {
@@ -348,9 +342,9 @@ void embed_surface(
             for (int j = 0; j < clipped_indices.size(); j++) {
                 // need to map oldface index to new face indices
                 std::array<size_t, 3> triangle_face = {
-                    polygon_face[clipped_indices[j][0]],
-                    polygon_face[clipped_indices[j][1]],
-                    polygon_face[clipped_indices[j][2]]};
+                    {polygon_face[clipped_indices[j][0]],
+                     polygon_face[clipped_indices[j][1]],
+                     polygon_face[clipped_indices[j][2]]}};
                 int idx = triangulated_faces.size();
                 triangulated_faces.push_back(triangle_face);
 
@@ -404,14 +398,14 @@ void embed_surface(
                 }
             }
 
-            std::array<size_t, 4> tetra = {v0, v1, v2, v3};
+            std::array<size_t, 4> tetra = {{v0, v1, v2, v3}};
 
             // if inverted then fix the orientation
             Vector3r v0v1 = v_rational[v1] - v_rational[v0];
             Vector3r v0v2 = v_rational[v2] - v_rational[v0];
             Vector3r v0v3 = v_rational[v3] - v_rational[v0];
             if ((v0v1.cross(v0v2)).dot(v0v3) < 0) {
-                tetra = {v1, v0, v2, v3};
+                tetra = {{v1, v0, v2, v3}};
             }
 
             // push the tet to final queue;
@@ -467,20 +461,20 @@ void embed_surface(
         for (const size_t f : polygon_cell) {
             for (const size_t t : map_poly_to_tri_face[f]) {
                 std::array<size_t, 4> tetra = {
-                    triangulated_faces[t][0],
-                    triangulated_faces[t][1],
-                    triangulated_faces[t][2],
-                    centroid_idx};
+                    {triangulated_faces[t][0],
+                     triangulated_faces[t][1],
+                     triangulated_faces[t][2],
+                     centroid_idx}};
                 // check inverted tet and fix
                 Vector3r v0v1 = v_rational[tetra[1]] - v_rational[tetra[0]];
                 Vector3r v0v2 = v_rational[tetra[2]] - v_rational[tetra[0]];
                 Vector3r v0v3 = v_rational[tetra[3]] - v_rational[tetra[0]];
                 if ((v0v1.cross(v0v2)).dot(v0v3) < 0) {
                     tetra = {
-                        triangulated_faces[t][1],
-                        triangulated_faces[t][0],
-                        triangulated_faces[t][2],
-                        centroid_idx};
+                        {triangulated_faces[t][1],
+                         triangulated_faces[t][0],
+                         triangulated_faces[t][2],
+                         centroid_idx}};
                 }
 
                 tets_final.push_back(tetra);
@@ -605,9 +599,7 @@ EmbedSurface::EmbedSurface(
 
     std::vector<Eigen::Vector3d> verts;
     std::vector<std::array<size_t, 3>> tris;
-    verts.resize(V.rows());
-    tris.resize(F.rows());
-    wmtk::eigen_to_wmtk_input(verts, tris, V, F);
+    VF_to_vectors(V, F, verts, tris);
 
     V_surf_from_vector(verts);
     F_surf_from_vector(tris);

components/image_simulation/wmtk/components/image_simulation/EmbedSurface.cpp

@@ -1238,7 +1238,7 @@ size_t ImageSimulationMesh::get_order_of_vertex(const size_t vid) const
 
 void ImageSimulationMesh::init_vertex_order()
 {
-    std::array<size_t, 4> count{0, 0, 0, 0};
+    std::array<size_t, 4> count{{0, 0, 0, 0}};
 
     for (const Tuple& t : get_vertices()) {
         const size_t vid = t.vid(*this);

components/image_simulation/wmtk/components/image_simulation/ImageSimulationMesh.cpp

@@ -279,8 +279,7 @@ void ImageSimulationMeshTri::init_surfaces_and_boundaries()
         const auto surf_edges = get_edges_by_condition([](auto& f) { return f.m_is_surface_fs; });
         for (const auto& verts : surf_edges) {
             std::array<Vector2d, 2> pp = {
-                m_vertex_attribute[verts[0]].m_pos,
-                m_vertex_attribute[verts[1]].m_pos};
+                {m_vertex_attribute[verts[0]].m_pos, m_vertex_attribute[verts[1]].m_pos}};
             if (m_envelope->is_outside(pp)) {
                 log_and_throw_error("Edge {} is outside!", verts);
             }
@@ -1239,7 +1238,7 @@ bool ImageSimulationMeshTri::collapse_edge_after(const Tuple& loc)
             const Vector2d a = VA.at(vids[0]).m_pos;
             const Vector2d b = VA.at(vids[1]).m_pos;
             // surface envelope
-            bool is_out = m_envelope->is_outside(std::array<Vector2d, 2>{a, b});
+            bool is_out = m_envelope->is_outside(std::array<Vector2d, 2>{{a, b}});
             if (is_out) {
                 return false;
             }
@@ -1854,7 +1853,7 @@ std::tuple<double, double> ImageSimulationMeshTri::local_operations(
         for (const auto& verts : faces) {
             const auto& p0 = m_vertex_attribute[verts[0]].m_pos;
             const auto& p1 = m_vertex_attribute[verts[1]].m_pos;
-            if (m_envelope->is_outside(std::array<Vector2d, 2>{p0, p1})) {
+            if (m_envelope->is_outside(std::array<Vector2d, 2>{{p0, p1}})) {
                 logger().error("Edge {} is outside!", verts);
             }
         }

components/image_simulation/wmtk/components/image_simulation/ImageSimulationMeshTri.cpp

@@ -4,7 +4,8 @@
 #include <jse/jse.h>
 
 #include <wmtk/utils/getRSS.h>
-#include <wmtk/utils/Reader.hpp>
+#include <wmtk/Types.hpp>
+#include <wmtk/io/read_triangle_mesh.hpp>
 #include <wmtk/utils/resolve_path.hpp>
 
 #include "IsotropicRemeshing.h"
@@ -78,15 +79,16 @@ void isotropic_remeshing(nlohmann::json json_params)
     std::vector<Eigen::Vector3d> verts;
     std::vector<std::array<size_t, 3>> tris;
     std::pair<Eigen::Vector3d, Eigen::Vector3d> box_minmax;
-    double remove_duplicate_eps = 1e-5;
     std::vector<size_t> modified_nonmanifold_v;
-    wmtk::stl_to_manifold_wmtk_input(
-        input_path,
-        remove_duplicate_eps,
-        box_minmax,
-        verts,
-        tris,
-        modified_nonmanifold_v);
+    {
+        double remove_duplicate_eps = 1e-5;
+        MatrixXd V;
+        MatrixXi F;
+        wmtk::io::read_triangle_mesh(input_path, V, F, remove_duplicate_eps);
+        box_minmax.first = V.colwise().minCoeff();
+        box_minmax.second = V.colwise().maxCoeff();
+        VF_to_vectors(V, F, verts, tris);
+    }
 
     double diag = (box_minmax.first - box_minmax.second).norm();
     const double envelope_size = env_rel * diag;