start to implement API for switching sort

Author: sjkelly

src/DistMesh.jl

@@ -15,25 +15,32 @@ abstract type AbstractDistMeshAlgorithm end
 
     iso (default: 0): Value of which to extract the iso surface, inside negative
     deltat (default: 0.1): the fraction of edge displacement to apply each iteration
+    sort (default:false):
 """
 struct DistMeshSetup{T} <: AbstractDistMeshAlgorithm
     iso::T
     deltat::T
     ttol::T
     ptol::T
+    sort::Bool # use hilbert sort to cache-localize points
+    sort_interval::Int # retriangulations before resorting
     distribution::Symbol # intial point distribution
 end
 
 function DistMeshSetup(;iso=0,
                         ptol=.001,
                         deltat=0.05,
                         ttol=0.02,
+                        sort=false,
+                        sort_interval=20,
                         distribution=:regular)
     T = promote_type(typeof(iso),typeof(ptol),typeof(deltat), typeof(ttol))
     DistMeshSetup{T}(iso,
                      deltat,
                      ttol,
                      ptol,
+                     sort,
+                     sort_interval,
                      distribution)
 end
 

src/distmeshnd.jl

@@ -71,9 +71,6 @@ function distmesh(fdist::Function,
         facecenteredcubic!(fdist, p, pt_dists, h, setup.iso, origin, widths, VertType)
     end
 
-    # use nearest neighbors kd tree to spatially sort points if point set is large
-    sort_pts = !have_fixed
-
     # initialize arrays
     pair_set = Set{Tuple{Int32,Int32}}()        # set used for ensure we have a unique set of edges
     pair = Tuple{Int32,Int32}[]                 # edge indices (Int32 since we use Tetgen)
@@ -93,17 +90,17 @@ function distmesh(fdist::Function,
     statsdata = DistMeshStatistics()
     lcount = 0 # iteration counter
     triangulationcount = 0 # triangulation counter
-    resortinterval = 10
 
     @inbounds while true
         # if large move, retriangulation
         if maxmove>setup.ttol*h
 
             # use hilbert sort to improve cache locality of points
-            if sort_pts && iszero(triangulationcount%resortinterval)
+            if setup.sort && iszero(triangulationcount % setup.sort_interval)
                 hilbertsort!(p)
             end
-            delaunayn!(fdist, p, t, geps, sort_pts) # compute a new delaunay triangulation
+
+            delaunayn!(fdist, p, t, geps, false) # compute a new delaunay triangulation
 
             tet_to_edges!(pair, pair_set, t) # Describe each edge by a unique pair of nodes
 
@@ -113,7 +110,7 @@ function distmesh(fdist::Function,
             non_uniform && resize!(L0, length(pair))
 
             # if the points were sorted we need to update the distance cache
-            if sort_pts && iszero(triangulationcount%resortinterval)
+            if setup.sort && iszero(triangulationcount % setup.sort_interval)
                 for i in eachindex(p)
                     pt_dists[i] = fdist(p[i])
                 end