Merge pull request #871 from wildmeshing/dzint/orig_tetwild

Fix sample envelope

Author: daniel-zint

components/tetwild/wmtk/components/tetwild/Smooth.cpp

@@ -174,8 +174,8 @@ bool TetWildMesh::smooth_after(const Tuple& t)
         {
             auto project = Eigen::Vector3d();
 
-            if (triangles_tree.initialized())
-                triangles_tree.nearest_point(m_vertex_attribute[vid].m_posf, project);
+            if (m_envelope.initialized())
+                m_envelope.nearest_point(m_vertex_attribute[vid].m_posf, project);
             else
                 project = wmtk::try_project(m_vertex_attribute[vid].m_posf, surface_assemble);
 

components/tetwild/wmtk/components/tetwild/TetWildMesh.h

@@ -97,22 +97,15 @@ class TetWildMesh : public wmtk::TetMesh
     const double MAX_ENERGY = 1e50;
 
     Parameters& m_params;
-    wmtk::Envelope& m_envelope;
-    // for surface projection
-    SampleEnvelope& triangles_tree;
+    SampleEnvelope& m_envelope;
 
     // for open boundary
     wmtk::Envelope m_open_boundary_envelope; // todo: add sample envelope option
     SampleEnvelope boundaries_tree;
 
-    TetWildMesh(
-        Parameters& _m_params,
-        wmtk::Envelope& _m_envelope,
-        SampleEnvelope& _triangles_tree,
-        int _num_threads = 1)
+    TetWildMesh(Parameters& _m_params, SampleEnvelope& _m_envelope, int _num_threads = 1)
         : m_params(_m_params)
         , m_envelope(_m_envelope)
-        , triangles_tree(_triangles_tree)
     {
         NUM_THREADS = _num_threads;
         p_vertex_attrs = &m_vertex_attribute;

components/tetwild/wmtk/components/tetwild/TriangleInsertion.cpp

@@ -79,7 +79,7 @@ void TetWildMesh::init_from_delaunay_box_mesh(const std::vector<Eigen::Vector3d>
                 const Vector3d p(ds[0][i], ds[1][j], ds[2][k]);
 
                 Eigen::Vector3d n;
-                const double sqd = triangles_tree.nearest_point(p, n);
+                const double sqd = m_envelope.nearest_point(p, n);
 
                 if (sqd < min_dis) {
                     continue;

components/tetwild/wmtk/components/tetwild/orig/MeshRefinement.cpp

@@ -295,23 +295,27 @@ void MeshRefinement::refine(
         // check and mark is_bad_element
         double avg_energy, max_energy;
         localOperation.getAvgMaxEnergy(avg_energy, max_energy);
+        logger().info("Energy: avg = {} | max = {}", avg_energy, max_energy);
         if (pass > 0 && pass < old_pass + args.max_num_passes - 1 &&
             avg_energy0 - avg_energy < args.delta_energy_thres &&
             max_energy0 - max_energy < args.delta_energy_thres) {
             if (update_cnt == 1) {
                 if (is_hit_min) {
                     update_buget--;
-                } else
+                } else {
                     continue;
+                }
             }
             if (update_buget == 0) {
                 if (state.sub_stage > 1 && state.sub_stage < args.stage) {
                     state.eps += state.eps_delta;
                     state.eps_2 = state.eps * state.eps;
                     state.sub_stage++;
                     update_buget = 2;
-                } else
+                } else {
+                    logger().warn(">>>>>>>>>> update_budget = 0 -> break in pass {}", pass);
                     break;
+                }
             }
             update_cnt = 0;
 
@@ -331,7 +335,6 @@ void MeshRefinement::refine(
         }
         avg_energy0 = avg_energy;
         max_energy0 = max_energy;
-        logger().info("Energy: avg = {} | max = {}", avg_energy, max_energy);
     }
 
     old_pass = old_pass + args.max_num_passes;

components/tetwild/wmtk/components/tetwild/tetwild.cpp

@@ -162,7 +162,7 @@ void tetwild(nlohmann::json json_params)
 
     double diag = (box_minmax.first - box_minmax.second).norm();
     const double envelope_size = params.epsr * diag;
-    app::sec::ShortestEdgeCollapse surf_mesh(verts, NUM_THREADS, false);
+    app::sec::ShortestEdgeCollapse surf_mesh(verts, NUM_THREADS, !use_sample_envelope);
     surf_mesh.create_mesh(verts.size(), tris, modified_nonmanifold_v, envelope_size / 2);
     assert(surf_mesh.check_mesh_connectivity_validity());
 
@@ -200,21 +200,7 @@ void tetwild(nlohmann::json json_params)
     params.init(box_minmax.first, box_minmax.second);
     wmtk::remove_duplicates(vsimp, fsimp, 1e-10 * params.diag_l);
 
-    wmtk::ExactEnvelope exact_envelope;
-    {
-        std::vector<Eigen::Vector3i> tempF(fsimp.size());
-        for (auto i = 0; i < tempF.size(); i++) tempF[i] << fsimp[i][0], fsimp[i][1], fsimp[i][2];
-        exact_envelope.init(vsimp, tempF, envelope_size / 2);
-    }
-
-    // initiate the tetwild mesh using the original envelop
-    wmtk::Envelope* ptr_env;
-    if (use_sample_envelope) {
-        ptr_env = &(surf_mesh.m_envelope);
-    } else {
-        ptr_env = &(exact_envelope);
-    }
-    tetwild::TetWildMesh mesh(params, *ptr_env, surf_mesh.m_envelope, NUM_THREADS);
+    tetwild::TetWildMesh mesh(params, surf_mesh.m_envelope, NUM_THREADS);
 
     /////////////////////////////////////////////////////
 
@@ -255,7 +241,7 @@ void tetwild(nlohmann::json json_params)
         tet_face_on_input_surface);
 
     // generate new mesh
-    tetwild::TetWildMesh mesh_new(params, *ptr_env, surf_mesh.m_envelope, NUM_THREADS);
+    tetwild::TetWildMesh mesh_new(params, surf_mesh.m_envelope, NUM_THREADS);
 
     mesh_new.init_from_Volumeremesher(
         v_rational,

src/wmtk/envelope/Envelope.cpp

@@ -95,7 +95,7 @@ void SampleEnvelope::init(
     const std::vector<Eigen::Vector3i>& F,
     const double _eps)
 {
-    if (use_exact) return exact_envelope.init(V, F, _eps);
+    exact_envelope.init(V, F, _eps);
 
     eps2 = _eps * _eps;
     sampling_dist = std::sqrt(eps2);