Skip to content

Commit 68b11bc

Browse files
authored
Merge pull request #5 from dengwirda/dev
Update to jigsaw-0.9.13.xx
2 parents f197385 + f87f9d5 commit 68b11bc

File tree

3 files changed

+115
-158
lines changed

3 files changed

+115
-158
lines changed

external/jigsaw/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## `JIGSAW: An unstructured mesh generator`
22

3-
<p align="center">
4-
<img src = "../master/img/bunny-TRIA3-1.png"> &nbsp
5-
<img src = "../master/img/bunny-TRIA3-2.png"> &nbsp
6-
<img src = "../master/img/bunny-TRIA3-3.png"> &nbsp
7-
<img src = "../master/img/bunny-TRIA4-3.png">
3+
<p align="middle">
4+
<img src = "../master/img/bunny-TRIA3-1.png" width="20%" hspace="0.25%">
5+
<img src = "../master/img/bunny-TRIA3-2.png" width="20%" hspace="0.25%">
6+
<img src = "../master/img/bunny-TRIA3-3.png" width="20%" hspace="0.25%">
7+
<img src = "../master/img/bunny-TRIA4-3.png" width="20%" hspace="0.25%">
88
</p>
99

1010
`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.

external/jigsaw/src/libcpp/iter_mesh/iter_divs_2.inc

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*
3232
--------------------------------------------------------
3333
*
34-
* Last updated: 30 April, 2020
34+
* Last updated: 12 Sept., 2020
3535
*
3636
* Copyright 2013-2020
3737
* Darren Engwirda
@@ -79,8 +79,8 @@
7979
iptr_type static constexpr
8080
_last = pred_type::geom_dims+0 ;
8181

82-
iptr_type static constexpr
83-
_DEG_TRIA3 = (iptr_type)+6 ;
82+
// iptr_type static constexpr
83+
// _DEG_TRIA3 = (iptr_type)+6 ;
8484
// iptr_type static constexpr
8585
// _DEG_QUAD4 = (iptr_type)+4 ;
8686

@@ -152,43 +152,8 @@
152152
POINT_tag, _jset) ;
153153

154154
/*--------------------------------- calc. local topo. */
155-
auto _ideg = _iset.count() ;
156-
auto _ierr =
157-
(iptr_type)(_ideg-_DEG_TRIA3) ;
158-
159-
auto _jdeg = _jset.count() ;
160-
auto _jerr =
161-
(iptr_type)(_jdeg-_DEG_TRIA3) ;
162-
163-
// bail-out early if the topological defect would be
164-
// made worse if the zip is done
165-
166-
if (+1 >std::max(_ierr, _jerr))
167-
return ;
168-
169-
if (+0 >std::min(_ierr, _jerr))
170-
return ;
171-
172-
if (+1 > _ierr + _jerr)
173-
return ;
174-
175-
// if more regular topo. is constructed via the edge
176-
// div, make it easier to do so!
177-
178-
real_type _qerr =
179-
(real_type)-1./9. * _ierr +
180-
(real_type)-1./9. * _jerr ;
181-
182-
real_type _lerr =
183-
(real_type)+5./6. * _lmin ;
184-
185-
_qerr /= std::cbrt(_iout) ; // no oscl. wrt. zip
186-
187-
if (+1 < _ierr + _jerr)
188-
{
189-
_qinc = std::min(_qinc, _qerr);
190-
_lmin = std::min(_lmin, _lerr);
191-
}
155+
if (_iset.count() <= +7) return;
156+
if (_jset.count() <= +7) return;
192157

193158
} // if (_lBIG)
194159

0 commit comments

Comments
 (0)