Merge pull request #869 from wildmeshing/dzint/orig_tetwild

Dzint/orig tetwild

Author: daniel-zint

app/qslim/src/qslim/QSLIM.cpp

@@ -368,7 +368,7 @@ bool QSLIM::collapse_qslim(int target_vert_number)
     auto measure_priority = [this](auto& m, auto op, const Tuple& new_e) {
         return -compute_cost_for_e(new_e);
     };
-    auto setup_and_execute = [&](auto executor) {
+    auto setup_and_execute = [&](auto& executor) {
         executor.num_threads = NUM_THREADS;
         executor.renew_neighbor_tuples = renew;
         executor.priority = measure_priority;

app/remeshing/src/remeshing/UniformRemeshing.cpp

@@ -430,7 +430,7 @@ bool UniformRemeshing::collapse_remeshing(double L)
         timer.getElapsedTimeInMilliSec());
 
     wmtk::logger().info("size for edges to be collapse is {}", collect_all_ops.size());
-    auto setup_and_execute = [&](auto executor) {
+    auto setup_and_execute = [&](auto& executor) {
         executor.renew_neighbor_tuples = renew;
         executor.priority = [&](auto& m, auto _, auto& e) {
             return m.compute_edge_cost_collapse(e, L);
@@ -520,7 +520,7 @@ bool UniformRemeshing::smooth_all_vertices()
     auto collect_all_ops = std::vector<std::pair<std::string, Tuple>>();
     for (auto& loc : get_edges()) collect_all_ops.emplace_back("vertex_smooth", loc);
 
-    auto setup_and_execute = [&](auto executor) {
+    auto setup_and_execute = [&](auto& executor) {
         executor.num_threads = NUM_THREADS;
 
         executor(*this, collect_all_ops);
@@ -553,7 +553,7 @@ bool UniformRemeshing::swap_remeshing()
     wmtk::logger().info("***** swap get edges time *****: {} ms", timer.getElapsedTimeInMilliSec());
 
 
-    auto setup_and_execute = [&](auto executor) {
+    auto setup_and_execute = [&](auto& executor) {
         executor.renew_neighbor_tuples = renew;
         executor.num_threads = NUM_THREADS;
         executor.priority = [](auto& m, auto op, const Tuple& e) {

app/shortest_edge_collapse/src/sec/ShortestEdgeCollapse.cpp

@@ -163,7 +163,7 @@ bool ShortestEdgeCollapse::collapse_shortest(int target_vert_number)
                 .squaredNorm();
         return -len2;
     };
-    auto setup_and_execute = [&](auto executor) {
+    auto setup_and_execute = [&](auto& executor) {
         executor.num_threads = NUM_THREADS;
         executor.renew_neighbor_tuples = renew;
         executor.priority = measure_len2;

components/tetwild/wmtk/components/tetwild/CMakeLists.txt

@@ -26,6 +26,27 @@ set(SRC_FILES
 	tetwild.hpp
 	tetwild.cpp
 	tetwild_spec.hpp
+
+	orig/Args.h
+	orig/Common.cpp
+	orig/Common.h
+	orig/EdgeCollapser.cpp
+	orig/EdgeCollapser.h
+	orig/EdgeRemover.cpp
+	orig/EdgeRemover.h
+	orig/EdgeSplitter.cpp
+	orig/EdgeSplitter.h
+	orig/ForwardDecls.h
+	orig/LocalOperations.cpp
+	orig/LocalOperations.h
+	orig/MeshRefinement.cpp
+	orig/MeshRefinement.h
+	orig/State.cpp
+	orig/State.h
+	orig/TetmeshElements.cpp
+	orig/TetmeshElements.h
+	orig/VertexSmoother.cpp
+	orig/VertexSmoother.h
     )
 
 target_sources(wmtk_${COMPONENT_NAME} PRIVATE ${SRC_FILES})