fixup ratio scaling and trim some steps

Author: sjkelly

src/quality.jl

@@ -95,20 +95,20 @@ function volume_edge_ratio(a,b,c,d)
     v = c .- d
     volume = t[1]*(u[2]*v[3]-v[2]*u[3])-u[1]*(t[2]*v[3]-v[2]*t[3])+v[1]*(t[2]*u[3]-u[2]*t[3])
     edges = (t,u,v,a.-b,b.-c,a.-c)
-    lengths = norm.(edges)
-    l_rms = sqrt(sum(lengths.^2)/6)
-    return volume/(sqrt(2)*l_rms^3)
+    lengths = dot.(edges,edges)
+    l_rms = sqrt(sum(lengths)/6)
+    return sqrt(2)*volume/(l_rms^3)
 end
 
 """
 
 update a pre-allocated array with tetrahedra qualities
 """
-function volume_edge_ratio(points::Vector{T},tets) where {T}
+function volume_edge_extrema(points::Vector{T},tets) where {T}
     n = length(tets)
     min_q = typemax(eltype(T))
     max_q = typemin(eltype(T))
-    for i = 1:n
+    @inbounds for i = 1:n
         tet = tets[i]
         q = volume_edge_ratio(points[tet[1]],points[tet[2]],points[tet[3]],points[tet[4]])
         min_q = min(q,min_q)

test/runtests.jl

@@ -43,12 +43,12 @@ end
         pts = ([1,0,-1/sqrt(2)], [-1,0,-1/sqrt(2)], [0,1,1/sqrt(2)], [0,-1,1/sqrt(2)])
         pts2 = ([1,1,1], [1,-1,-1], [-1,1,-1], [-1,-1,1])
         pts_degenerate = ([1,1,1], [1,1,1], [-1,1,-1], [-1,-1,1])
-        @show DistMesh.volume_edge_ratio(pts...)
-        @show DistMesh.volume_edge_ratio((pts.*2)...)
-        @show DistMesh.volume_edge_ratio((pts.*1e-6)...) ≈ 0.5
+        @test DistMesh.volume_edge_ratio(pts...) ≈ 1
+        @test DistMesh.volume_edge_ratio((pts.*2)...) ≈ 1
+        @test DistMesh.volume_edge_ratio((pts.*1e-6)...) ≈ 1
         @test isnan(DistMesh.volume_edge_ratio((pts.*0)...))
-        @show DistMesh.volume_edge_ratio(pts2...)
-        @show DistMesh.volume_edge_ratio((pts2.*2)...)
+        @test DistMesh.volume_edge_ratio(pts2...) ≈ 1
+        @test DistMesh.volume_edge_ratio((pts2.*2)...) ≈ 1
         @test DistMesh.volume_edge_ratio(pts_degenerate...) == 0
 
     end