Merge pull request #43 from dengwirda/dev

Update to jigsaw-0.9.15.x
dengwirda · Apr 19, 2021 · 76b41a0 · 76b41a0
2 parents 8684fa9 + 1048d18
commit 76b41a0
Show file tree

Hide file tree

Showing 29 changed files with 496 additions and 595 deletions.
diff --git a/src/jigsaw.cpp b/src/jigsaw.cpp
@@ -41,7 +41,8 @@
     --------------------------------------------------------
      *
      * JIGSAW release 0.9.15.x
-     * Last updated: 08 April, 2021
+     *
+     * Last updated: 16 April, 2021
      *
      * Copyright 2013 -- 2021
      * Darren Engwirda
@@ -265,7 +266,7 @@
 #   include "libcpp/useropts.hpp"
 
 #   include "libcpp/rdelmesh.hpp"
-#   include "libcpp/treemesh.hpp"
+//  include "libcpp/treemesh.hpp"
 #   include "libcpp/itermesh.hpp"
 
     extern  "C"

diff --git a/src/jigsaw.hpp b/src/jigsaw.hpp
@@ -14,9 +14,9 @@
      * JIGSAW: an unstructured mesh generation library.
     --------------------------------------------------------
      *
-     * Last updated: 16 July, 2020
+     * Last updated: 16 Apr., 2021
      *
-     * Copyright 2013 -- 2020
+     * Copyright 2013 -- 2021
      * Darren Engwirda
      * [email protected]
      * https://github.com/dengwirda
@@ -1059,15 +1059,13 @@
 
 #       ifdef  __use_timers
         typename std ::chrono::
-        high_resolution_clock::
-            time_point _ttic ;
+        high_resolution_clock::time_point  _ttic ;
         typename std ::chrono::
-        high_resolution_clock::
-            time_point _ttoc ;
+        high_resolution_clock::time_point  _ttoc ;
         typename std ::chrono::
-        high_resolution_clock _time;
+        high_resolution_clock _time ;
 
-        __unreferenced(_time) ;
+        __unreferenced(_time) ; // why does MSVC need this??
 #       endif//__use_timers
 
     /*--------------------------------- init. geo. kernel */
@@ -1495,15 +1493,13 @@
 
 #       ifdef  __use_timers
         typename std ::chrono::
-        high_resolution_clock::
-            time_point _ttic ;
+        high_resolution_clock::time_point  _ttic ;
         typename std ::chrono::
-        high_resolution_clock::
-            time_point _ttoc ;
+        high_resolution_clock::time_point  _ttoc ;
         typename std ::chrono::
-        high_resolution_clock _time;
+        high_resolution_clock _time ;
 
-        __unreferenced(_time) ;
+        __unreferenced(_time) ; // why does MSVC need this??
 #       endif//__use_timers
 
     /*--------------------------------- init. geo. kernel */

diff --git a/src/libcpp/geom_type/geom_mesh_ellipsoid_3.hpp b/src/libcpp/geom_type/geom_mesh_ellipsoid_3.hpp
@@ -31,7 +31,7 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 14 Apr., 2021
+     * Last updated: 17 Apr., 2021
      *
      * Copyright 2013-2021
      * Darren Engwirda
@@ -683,8 +683,8 @@
         if (_opts.dims() < +3)
         {
     /*------------------------- point at ellipsoid centre */
-        real_type  _ppos[4] ;
-        iptr_type  _inod;
+        real_type  _ppos[4];
+        iptr_type  _inod = -1;
         _ppos[0] = (real_type) +0.0E+0 ;
         _ppos[1] = (real_type) +0.0E+0 ;
         _ppos[2] = (real_type) +0.0E+0 ;
@@ -809,8 +809,8 @@
 
         real_type  _lo = 2.*_pi / 10. ;
 
-        real_type  _ppos[4] ;
-        iptr_type  _inod;
+        real_type  _ppos[4];
+        iptr_type  _inod = -1;
         _ppos[0] = this->_radA *
         std::cos(_pi*(real_type)+0.0) *
         std::cos(_pi*(real_type)+0.5) ;
@@ -840,6 +840,7 @@
         _ppos[2] = this->_radC *
         std::sin(_pi*(real_type)-0.5) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -860,6 +861,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)+1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -880,6 +882,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)-1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -900,6 +903,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)+1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -920,6 +924,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)-1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -940,6 +945,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)+1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -960,6 +966,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)-1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -980,6 +987,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)+1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -1000,6 +1008,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)-1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -1020,6 +1029,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)+1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.
@@ -1040,6 +1050,7 @@
         _ppos[2] = this->_radC *
         std::sin(_la*(real_type)-1.0) ;
         _ppos[3] =   (real_type)+0.0;
+        _inod = -1 ;
         _rdel.
         _tria.push_node(_ppos, _inod) ;
         _rdel.

diff --git a/src/libcpp/geom_type/geom_mesh_euclidean_2.hpp b/src/libcpp/geom_type/geom_mesh_euclidean_2.hpp
@@ -31,7 +31,7 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 01 Feb., 2021
+     * Last updated: 17 Apr., 2021
      *
      * Copyright 2013-2021
      * Darren Engwirda

diff --git a/src/libcpp/geom_type/geom_mesh_euclidean_3.hpp b/src/libcpp/geom_type/geom_mesh_euclidean_3.hpp
@@ -31,7 +31,7 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 01 Feb., 2021
+     * Last updated: 17 Apr., 2021
      *
      * Copyright 2013-2021
      * Darren Engwirda

diff --git a/src/libcpp/iter_mesh/iter_mesh_2.hpp b/src/libcpp/iter_mesh/iter_mesh_2.hpp
@@ -1842,11 +1842,11 @@
 
     #   ifdef  __use_timers
         typename std ::chrono::
-        high_resolution_clock::time_point _ttic;
+        high_resolution_clock::time_point  _ttic ;
         typename std ::chrono::
-        high_resolution_clock::time_point _ttoc;
+        high_resolution_clock::time_point  _ttoc ;
         typename std ::chrono::
-        high_resolution_clock _time;
+        high_resolution_clock _time ;
 
         __unreferenced(_time) ; // why does MSVC need this??
     #   endif//__use_timers

diff --git a/src/libcpp/iter_mesh/iter_zips_2.inc b/src/libcpp/iter_mesh/iter_zips_2.inc
@@ -31,9 +31,9 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 27 Dec., 2020
+     * Last updated: 16 Apr., 2021
      *
-     * Copyright 2013-2020
+     * Copyright 2013-2021
      * Darren Engwirda
      * [email protected]
      * https://github.com/dengwirda/
@@ -73,7 +73,7 @@
         real_type  _lmax
             = (real_type) +8.00E-01 ,
         real_type  _qinc
-            = (real_type) +1.00E-03
+            = (real_type) +1.00E-02
         )
     {
         iptr_type static constexpr
@@ -160,12 +160,18 @@
     //  zip, make it easier to do so!
 
         real_type _qerr =
-            (real_type)-1./8. *
+            (real_type)-2./16. *
+                std::max(_ierr, _jerr);
+
+        real_type _lerr =
+            (real_type)+1./16. *
                 std::max(_ierr, _jerr);
 
         if (2 * _nerr < _iabs + _jabs)
         {
         _qinc = std::min(_qinc, _qerr);
+        _lmax = std::max(_lmax,
+                         _lmax+ _lerr);
         }
 
     /*--------------------------------- get edge h-sizing */

diff --git a/src/libcpp/rdel_mesh/rdel_base_2.hpp b/src/libcpp/rdel_mesh/rdel_base_2.hpp
@@ -321,7 +321,7 @@
 
     /*--------------------------- find loc. intersections */
         mesh::keep_all_2d <
-            real_type, 
+            real_type,
             iptr_type     > _pred;
 
         if(!_geom.intersect(_line, _pred) )
@@ -340,7 +340,7 @@
            &_mesh._tria.tria(_tadj)->circ(0),
            &_mesh._tria.node(
                 _enod[1])->pval(0)) ;
-        
+
         _radj += geometry::lensqr_2d (
            &_mesh._tria.tria(_tadj)->circ(0),
            &_mesh._tria.node(
@@ -350,12 +350,12 @@
            &_mesh._tria.tria(_topp)->circ(0),
            &_mesh._tria.node(
                 _onod[0])->pval(0)) ;
-        
+
         _radj += geometry::lensqr_2d (
            &_mesh._tria.tria(_topp)->circ(0),
            &_mesh._tria.node(
                 _onod[1])->pval(0)) ;
-        
+
         _radj += geometry::lensqr_2d (
            &_mesh._tria.tria(_topp)->circ(0),
            &_mesh._tria.node(

diff --git a/src/libcpp/rdel_mesh/rdel_base_3.hpp b/src/libcpp/rdel_mesh/rdel_base_3.hpp
@@ -412,7 +412,7 @@
         _flat._nvec[2] = _evec[2] ;
 
         mesh::keep_all_3d <
-            real_type , 
+            real_type ,
             iptr_type     > _pred ;
 
         if(!_geom.intersect(_flat, _pred) )
@@ -767,7 +767,7 @@
 
     /*--------------------------- calc. intersection halo */
         mesh::keep_all_3d <
-            real_type , 
+            real_type ,
             iptr_type     > _pred;
 
         if(!_geom.intersect(_line, _pred) )

diff --git a/src/libcpp/rdel_mesh/rdel_create_init_2.inc b/src/libcpp/rdel_mesh/rdel_create_init_2.inc
@@ -31,7 +31,7 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 24 Feb., 2021
+     * Last updated: 17 Apr., 2021
      *
      * Copyright 2013-2021
      * Darren Engwirda
@@ -82,7 +82,6 @@
         {
             if (_node->mark() >= +0)
             {
-
             _bbox.push_tail() ;
             _bbox.tail()->
                pval(0) = _node->pval(0) ;
@@ -91,7 +90,6 @@
 
             _bbox.tail()->
                ipos () = _npos ;
-
             }
         }
 
@@ -296,12 +294,16 @@
         }
 
     /*------------------------------ seed node from init. */
+        iptr_type _base =
+            _mesh._tria._nset.count () ;
+
         if (_imid > -1)
         {
              auto _node =
            &_init._mesh. node ( _imid) ;
 
-            iptr_type _npos = -1 ;
+            iptr_type _npos =
+                _base+_imid -  0 ;
             iptr_type _near = -1 ;
 
             if (_node->itag () >= +0 )
@@ -382,8 +384,9 @@
              auto _node =
            &_init._mesh . node(*_iter) ;
 
+            iptr_type _npos =
+               *_iter+_base -  0 ;
             iptr_type _near = -1 ;
-            iptr_type _npos = -1 ;
 
             if (_node->itag () >= +0 )
                 _geom.projector(