consolidate point distribution

Author: sjkelly

src/DistMesh.jl

@@ -62,27 +62,31 @@ Use Tetrahedral quality analysis to control the meshing process
 struct DistMeshQuality{T} <: AbstractDistMeshAlgorithm
     iso::T
     deltat::T
-    minimum::T
+    filter_less_than::T # Remove tets less than the given quality
+    #allow_n_regressions::Int # Might want this
+    termination_quality::T # Once achieved, terminate
     sort::Bool # use hilbert sort to cache-localize points
     sort_interval::Int # retriangulations before resorting
     nonlinear::Bool # uses nonlinear edge force
     distribution::Symbol # intial point distribution
 end
 
 function DistMeshQuality(;iso=0,
-                        ptol=.001,
                         deltat=0.05,
-                        ttol=0.02,
+                        filter_less_than=0.02,
+                        termination_quality=0.3,
                         sort=false,
                         sort_interval=20,
-                        nonlinear=false,
+                        nonlinear=true,
                         distribution=:regular)
-    T = promote_type(typeof(iso),typeof(ptol),typeof(deltat), typeof(ttol))
-    DistMeshQuality{T}(iso,
-                     deltat,
-                     ttol,
-                     ptol,
-                     distribution)
+    DistMeshQuality(iso,
+                    deltat,
+                    filter_less_than,
+                    termination_quality,
+                    sort,
+                    sort_interval,
+                    nonlinear,
+                    distribution)
 end
 
 """

src/distmeshnd.jl

@@ -73,15 +73,10 @@ function distmesh(fdist::Function,
         p = VertType[]
     end
 
-    pt_dists = map(fdist, p) # cache to store point locations so we can minimize fdist calls
-
-    # add points to p based on the initial distribution
-    if setup.distribution === :regular
-        simplecubic!(fdist, p, pt_dists, h, setup.iso, origin, widths, VertType)
-    elseif setup.distribution === :packed
-        # face-centered cubic point distribution
-        facecenteredcubic!(fdist, p, pt_dists, h, setup.iso, origin, widths, VertType)
-    end
+    pt_dists = eltype(VertType)[]
+
+    # setup the initial point distribution specified in setup
+    point_distribution!(fdist,p,pt_dists,h, setup, origin, widths, VertType)
 
     # Result struct for holding points, simplices, and iteration statistics
     result = DistMeshResult(p,

src/pointdistribution.jl

@@ -22,4 +22,16 @@ function facecenteredcubic!(fdist, points, dists, h, iso, origin, widths, ::Type
             push!(dists, d)
         end
     end
-end
+end
+
+function point_distribution!(fdist, p, pt_dists, h, setup, origin, widths, ::Type{VertType}) where VertType
+    map!(fdist, pt_dists, p) # cache to store point locations so we can minimize fdist calls
+
+    # add points to p based on the initial distribution
+    if setup.distribution === :regular
+        simplecubic!(fdist, p, pt_dists, h, setup.iso, origin, widths, VertType)
+    elseif setup.distribution === :packed
+        # face-centered cubic point distribution
+        facecenteredcubic!(fdist, p, pt_dists, h, setup.iso, origin, widths, VertType)
+    end
+end