Merge pull request #20 from dengwirda/dev

Update bindings for jigsaw-0.9.13.xx
dengwirda · Sep 14, 2020 · 52e8f86 · 52e8f86
2 parents 02e2465 + c2110c5
commit 52e8f86
Show file tree

Hide file tree

Showing 290 changed files with 30,862 additions and 19,115 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 ## `JIGSAW: An unstructured mesh generator`
 
-<p align="center">
-  <img src = "../master/external/jigsaw/img/bunny-TRIA3-1.png"> &nbsp
-  <img src = "../master/external/jigsaw/img/bunny-TRIA3-2.png"> &nbsp
-  <img src = "../master/external/jigsaw/img/bunny-TRIA3-3.png"> &nbsp
-  <img src = "../master/external/jigsaw/img/bunny-TRIA4-3.png">
+<p align="middle">
+  <img src = "../master/external/jigsaw/img/bunny-TRIA3-1.png" width="20%" hspace="0.25%">
+  <img src = "../master/external/jigsaw/img/bunny-TRIA3-2.png" width="20%" hspace="0.25%">
+  <img src = "../master/external/jigsaw/img/bunny-TRIA3-3.png" width="20%" hspace="0.25%">
+  <img src = "../master/external/jigsaw/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/bisect.m b/bisect.m
@@ -5,7 +5,7 @@
 %   Darren Engwirda
 %   github.com/dengwirda/jigsaw-matlab
 %   08-Aug-2019
-%   darren.engwirda@columbia.edu
+%   d.engwirda@gmail.com
 %-----------------------------------------------------------
 %
 

diff --git a/certify.m b/certify.m
@@ -4,8 +4,8 @@
 %-----------------------------------------------------------
 %   Darren Engwirda
 %   github.com/dengwirda/jigsaw-matlab
-%   07-Aug-2019
-%   darren.engwirda@columbia.edu
+%   30-May-2020
+%   d.engwirda@gmail.com
 %-----------------------------------------------------------
 %
 
@@ -576,6 +576,50 @@
         end
     end
 
+    if (inspect(mesh,'seeds'))
+        if (~isempty  (mesh.seeds.coord))
+        if ( isnumeric(mesh.seeds.coord))
+%----------------------------------------- check SEEDS array
+        ns = size(mesh.seeds.coord,1) ;
+
+        if (ndims(mesh.seeds.coord) ~= 2)
+        error('certify:incorrectDimensions', ...
+            'Invalid SEEDS.COORD dimensions.') ;
+        end
+        if ( size(mesh.seeds.coord,2)< 3)
+        error('certify:incorrectDimensions', ...
+            'Invalid SEEDS.COORD dimensions.') ;
+        end
+
+        if (any(isinf(mesh.seeds.coord)))
+        error('certify:invalidMeshPosition', ...
+            'Invalid SEEDS.COORD values.') ;
+        end
+        if (any(isnan(mesh.seeds.coord)))
+        error('certify:invalidMeshPosition', ...
+            'Invalid SEEDS.COORD values.') ;
+        end
+
+        if (isfield(mesh,'mshID'))
+        if (strcmpi(mesh.mshID,'euclidean-grid'))
+        error('certify:incompatiblemshID', ...
+            'Incompatible msh-ID flag.') ;
+        end
+        if (strcmpi(mesh.mshID,'ellipsoid-grid'))
+        error('certify:incompatiblemshID', ...
+            'Incompatible msh-ID flag.') ;
+        end
+        end
+
+        else
+%----------------------------------------- wrong SEEDS class
+        error('certify:incorrectInputClass', ...
+            'Invalid SEEDS.COORD type.') ;
+
+        end
+        end
+    end
+
 %----------------------------------------- ok if we get here
     flag = +1 ;
 

diff --git a/compile.m b/compile.m
@@ -17,7 +17,7 @@
 %   Darren Engwirda
 %   github.com/dengwirda/jigsaw-matlab
 %   26-Jul-2019
-%   darren.engwirda@columbia.edu
+%   d.engwirda@gmail.com
 %-----------------------------------------------------------
 %
 

diff --git a/details.m b/details.m
@@ -66,6 +66,6 @@
 %   Darren Engwirda
 %   github.com/dengwirda/jigsaw-matlab
 %   26-Jul-2019
-%   darren.engwirda@columbia.edu
+%   d.engwirda@gmail.com
 %-----------------------------------------------------------
 %
diff --git a/example.m b/example.m
@@ -46,7 +46,7 @@ function example(varargin)
 %   Darren Engwirda
 %   github.com/dengwirda/jigsaw-matlab
 %   07-Aug-2019
-%   darren.engwirda@columbia.edu
+%   d.engwirda@gmail.com
 %-----------------------------------------------------------
 %
 
@@ -1122,6 +1122,8 @@ function example(varargin)
     opts.hfun_hmax = +inf ;
     opts.hfun_hmin = +0.0 ;
 
+   %opts.optm_kern = 'cvt+dqdx';
+
     mesh = jigsaw  (opts) ;
 
     figure ; drawmesh(mesh) ;

diff --git a/external/jigsaw/README.md b/external/jigsaw/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/external/jigsaw/inc/jigsaw_const.h b/external/jigsaw/inc/jigsaw_const.h
@@ -31,11 +31,11 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 27 November, 2019
+     * Last updated: 16 July, 2020
      *
-     * Copyright 2013-2019
+     * Copyright 2013-2020
      * Darren Engwirda
-     * darren.engwirda@columbia.edu
+     * d.engwirda@gmail.com
      * https://github.com/dengwirda
      *
     --------------------------------------------------------
@@ -55,6 +55,9 @@
 #       define JIGSAW_FILE_NOT_CREATED +3
 
 #       define JIGSAW_INVALID_ARGUMENT +4
+#       define JIGSAW_INVALID_INDEXING +5
+#       define JIGSAW_INVALID_USEROPTS +6
+#       define JIGSAW_INVALID_ARRAYDIM +7
 
     /*
     --------------------------------------------------------
@@ -93,6 +96,7 @@
 
 #       define JIGSAW_KERN_ODT_DQDX  +404
 #       define JIGSAW_KERN_CVT_DQDX  +405
+#       define JIGSAW_KERN_H95_DQDX  +406
 
 
 
diff --git a/external/jigsaw/inc/jigsaw_jig_t.h b/external/jigsaw/inc/jigsaw_jig_t.h
@@ -35,7 +35,7 @@
      *
      * Copyright 2013-2019
      * Darren Engwirda
-     * darren.engwirda@columbia.edu
+     * d.engwirda@gmail.com
      * https://github.com/dengwirda
      *
     --------------------------------------------------------

diff --git a/external/jigsaw/inc/jigsaw_msh_t.h b/external/jigsaw/inc/jigsaw_msh_t.h
@@ -31,11 +31,11 @@
      *
     --------------------------------------------------------
      *
-     * Last updated: 27 June, 2019
+     * Last updated: 30 May, 2020
      *
-     * Copyright 2013-2019
+     * Copyright 2013-2020
      * Darren Engwirda
-     * darren.engwirda@columbia.edu
+     * d.engwirda@gmail.com
      * https://github.com/dengwirda
      *
     --------------------------------------------------------
@@ -209,6 +209,9 @@
 
         jigsaw_BOUND_array_t    _bound;
 
+        jigsaw_VERT2_array_t    _seed2;
+        jigsaw_VERT3_array_t    _seed3;
+
     /* if (_flags == ELLIPSOID_MESH) */
 
         jigsaw_REALS_array_t    _radii;

diff --git a/external/jigsaw/inc/lib_jigsaw.h b/external/jigsaw/inc/lib_jigsaw.h
@@ -18,7 +18,7 @@
      *
      * Copyright 2013 -- 2019
      * Darren Engwirda
-     * darren.engwirda@columbia.edu
+     * d.engwirda@gmail.com
      * https://github.com/dengwirda
      *
     --------------------------------------------------------

diff --git a/external/jigsaw/src/CMakeLists.txt b/external/jigsaw/src/CMakeLists.txt
@@ -2,7 +2,7 @@ function (cfg_compile_options OPT CFG)
   add_compile_options ("$<$<CONFIG:${CFG}>:${OPT}>")
 endfunction ()
 
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"   OR