Merge pull request #3394 from roystgnr/refinement_fix

Poly2Tri refinement API fix

Author: roystgnr

src/mesh/poly2tri_triangulator.C

@@ -209,7 +209,7 @@ void Poly2TriTriangulator::triangulate()
     {
       this->triangulate_current_points();
     }
-  while (!this->insert_refinement_points());
+  while (this->insert_refinement_points());
 
   // Okay, we really do need to support boundary ids soon, but we
   // don't yet
@@ -1145,7 +1145,7 @@ bool Poly2TriTriangulator::insert_refinement_points()
     mesh.add_elem(std::move(new_elem_pair.second));
 
   // Did we add anything?
-  return new_elems.empty();
+  return !new_elems.empty();
 }
 
 

tests/mesh/mesh_triangulation.C

@@ -45,6 +45,7 @@ public:
   CPPUNIT_TEST( testPoly2TriEdgesRefined );
   CPPUNIT_TEST( testPoly2TriSegments );
   CPPUNIT_TEST( testPoly2TriRefined );
+  CPPUNIT_TEST( testPoly2TriNonRefined );
   CPPUNIT_TEST( testPoly2TriExtraRefined );
   CPPUNIT_TEST( testPoly2TriHolesRefined );
   CPPUNIT_TEST( testPoly2TriHolesInterpRefined );
@@ -901,7 +902,11 @@ public:
 
     triangulator.triangulate();
 
-    CPPUNIT_ASSERT(mesh.n_elem() > n_original_elem);
+    // If refinement should have increased our element count, check it
+    if (desired_area || area_func)
+      CPPUNIT_ASSERT_LESS(mesh.n_elem(), n_original_elem); // n_elem+++
+    else
+      CPPUNIT_ASSERT_EQUAL(mesh.n_elem(), n_original_elem);
 
     Real area = 0;
     for (const auto & elem : mesh.active_local_element_ptr_range())
@@ -940,6 +945,17 @@ public:
     testPoly2TriRefinementBase(mesh, nullptr, 1.5, 15);
   }
 
+  void testPoly2TriNonRefined()
+  {
+    LOG_UNIT_TEST;
+
+    Mesh mesh(*TestCommWorld);
+    testPoly2TriTrapMesh(mesh);
+    // Make sure we see 0 as "don't refine", not "infinitely refine"
+    testPoly2TriRefinementBase(mesh, nullptr, 1.5, 2, 0);
+  }
+
+
   void testPoly2TriExtraRefined()
   {
     LOG_UNIT_TEST;