Squashed 'external/jigsaw/' changes from 6798909..b48a83a

b48a83a Merge pull request #36 from dengwirda/dev 3a80cb3 0.9.13 updates: support for non-simplex elements, etc 55a014c 0.9.13 updates: support for non-simplex elements, etc b131785 0.9.13 updates: support for non-simplex elements, etc git-subtree-dir: external/jigsaw git-subtree-split: b48a83a9fb3315732a56658fa800e6d3f3679abf
dengwirda · Sep 13, 2020 · dee43fb · dee43fb
1 parent d880582
commit dee43fb
Show file tree

Hide file tree

Showing 3 changed files with 115 additions and 158 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 ## `JIGSAW: An unstructured mesh generator`
 
-<p align="center">
-  <img src = "../master/img/bunny-TRIA3-1.png"> &nbsp
-  <img src = "../master/img/bunny-TRIA3-2.png"> &nbsp
-  <img src = "../master/img/bunny-TRIA3-3.png"> &nbsp
-  <img src = "../master/img/bunny-TRIA4-3.png">
+<p align="middle">
+  <img src = "../master/img/bunny-TRIA3-1.png" width="20%" hspace="0.25%">
+  <img src = "../master/img/bunny-TRIA3-2.png" width="20%" hspace="0.25%">
+  <img src = "../master/img/bunny-TRIA3-3.png" width="20%" hspace="0.25%">
+  <img src = "../master/img/bunny-TRIA4-3.png" width="20%" hspace="0.25%">
 </p>
 
 `JIGSAW` is an unstructured mesh generator and tessellation library; designed to generate high-quality triangulations and polyhedral decompositions of general planar, surface and volumetric domains. `JIGSAW` includes refinement-based algorithms for the construction of new meshes, optimisation-driven techniques for the improvement of existing grids, as well as routines to assemble (restricted) Delaunay tessellations, Voronoi complexes and Power diagrams. 

diff --git a/src/libcpp/iter_mesh/iter_divs_2.inc b/src/libcpp/iter_mesh/iter_divs_2.inc
@@ -31,7 +31,7 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 30 April, 2020
+     * Last updated: 12 Sept., 2020
      *
      * Copyright 2013-2020
      * Darren Engwirda
@@ -79,8 +79,8 @@
         iptr_type static constexpr
             _last = pred_type::geom_dims+0 ;
 
-        iptr_type static constexpr
-            _DEG_TRIA3 = (iptr_type)+6 ;
+    //  iptr_type static constexpr
+    //      _DEG_TRIA3 = (iptr_type)+6 ;
     //  iptr_type static constexpr
     //      _DEG_QUAD4 = (iptr_type)+4 ;
 
@@ -152,43 +152,8 @@
              POINT_tag, _jset) ;
 
     /*--------------------------------- calc. local topo. */
-        auto _ideg = _iset.count() ;
-        auto _ierr =
-            (iptr_type)(_ideg-_DEG_TRIA3) ;
-
-        auto _jdeg = _jset.count() ;
-        auto _jerr =
-            (iptr_type)(_jdeg-_DEG_TRIA3) ;
-
-    //  bail-out early if the topological defect would be
-    //  made worse if the zip is done
-
-        if (+1 >std::max(_ierr, _jerr))
-            return  ;
-
-        if (+0 >std::min(_ierr, _jerr))
-            return  ;
-
-        if (+1 > _ierr + _jerr)
-            return  ;
-
-    //  if more regular topo. is constructed via the edge
-    //  div, make it easier to do so!
-
-        real_type _qerr =
-            (real_type)-1./9. * _ierr +
-            (real_type)-1./9. * _jerr ;
-
-        real_type _lerr =
-            (real_type)+5./6. * _lmin ;
-
-        _qerr /= std::cbrt(_iout) ;  // no oscl. wrt. zip
-
-        if (+1 < _ierr + _jerr)
-        {
-        _qinc = std::min(_qinc, _qerr);
-        _lmin = std::min(_lmin, _lerr);
-        }
+        if (_iset.count() <= +7) return;
+        if (_jset.count() <= +7) return;
 
         }   // if (_lBIG)