reenable nonlinear

Author: sjkelly

src/DistMesh.jl

@@ -28,6 +28,7 @@ struct DistMeshSetup{T} <: AbstractDistMeshAlgorithm
     ptol::T
     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
 
@@ -37,6 +38,7 @@ function DistMeshSetup(;iso=0,
                         ttol=0.02,
                         sort=false,
                         sort_interval=20,
+                        nonlinear=false,
                         distribution=:regular)
     T = promote_type(typeof(iso),typeof(ptol),typeof(deltat), typeof(ttol))
     DistMeshSetup{T}(iso,
@@ -45,6 +47,7 @@ function DistMeshSetup(;iso=0,
                      ptol,
                      sort,
                      sort_interval,
+                     nonlinear,
                      distribution)
 end
 

src/common.jl

@@ -34,8 +34,7 @@ function compute_displacements!(fh, dp, pair, L, L0, bars, p, setup,
         if non_uniform && L[i] < L0[i]*lscbrt || L[i] < lscbrt
             L0_f = non_uniform ? L0[i].*lscbrt : lscbrt
             # compute force vectors
-            #F = setup.nonlinear ? (L[i]+L0_f)*(L0_f-L[i])/(2*L0_f) : L0_f-L[i]
-            F = L0_f-L[i]
+            F = setup.nonlinear ? (L[i]+L0_f)*(L0_f-L[i])/(2*L0_f) : L0_f-L[i]
             # edges are not allowed to pull, only repel
             FBar = bars[i].*F./L[i]
             # add the force vector to the node