Minor fix to demos such as missing package calls

Author: Kevin-Mattheus-Moerman

examples/demo_boundaryfaces.jl

@@ -51,12 +51,11 @@ for testCase = 1:3
     Cbs = simplex2vertexdata(Fbs,Cb)
 
     ax1 = Axis3(fig[1, 1], aspect = :data, xlabel = "X", ylabel = "Y", zlabel = "Z", title = "Input faces")
-    hp1 = poly!(ax1,GeometryBasics.Mesh(Vs,Fs), strokewidth=1,shading=FastShading,strokecolor=:black, color=:white, transparency=true, overdraw=false)
+    hp1 = meshplot!(ax1, Fs, Vs, transparency=true)
 
     ax2 = Axis3(fig[1, 2], aspect = :data, xlabel = "X", ylabel = "Y", zlabel = "Z", title = "Boundary faces")
-    hp1 = poly!(ax2,GeometryBasics.Mesh(Vbs,Fbs), strokewidth=1,shading=FastShading,strokecolor=:black, color=Cbs, transparency=true, overdraw=false)
+    hp2 = meshplot!(ax2, Fbs, Vbs, color=Cbs, transparency=true, overdraw=false)
 
     screen = display(GLMakie.Screen(), fig)
     GLMakie.set_title!(screen, "testCase = $testCase")
-
 end

examples/demo_hermiteSegment.jl

@@ -1,6 +1,7 @@
 using Comodo
 using Comodo.GLMakie
 using Comodo.GeometryBasics
+using Comodo.LinearAlgebra
 
 #=
 This demo shows the use of hermiteSegment to set up a Hermite spline using a set

examples/demo_hexahedronElement.jl

@@ -20,4 +20,4 @@ fig = Figure(size=(1700, 1000))
 ax1 = AxisGeom(fig[1,1], aspect = :data, xlabel = "X", ylabel = "Y", zlabel = "Z", title = "A hexahedral element")
 hp1 = meshplot!(ax1, Fs, Vs, color=(:white, 0.25), strokewidth=3, strokecolor=:blue, transparency=true)
 screen = display(GLMakie.Screen(), fig)
-GLMakie.set_title!(screen, "testCase = $testCase")
+fig

examples/demo_load_view_obj.jl

@@ -35,7 +35,7 @@ for testCase = 1:3
     fig = Figure(size=(800,800))
     ax1 = AxisGeom(fig[1, 1], title = "Spot the cow")
 
-    hp1 = poly!(ax1,M, color=T, shading = FastShading, transparency=false,strokecolor=:black,strokewidth=1,stroke_depth_shift=-0.001f0)
+    hp1 = poly!(ax1, M, color=T, shading = true, strokecolor=:black, strokewidth=1, stroke_depth_shift=-0.001f0)
 
     screen = display(GLMakie.Screen(), fig)
     GLMakie.set_title!(screen, "testCase = $testCase")

examples/demo_mergevertices.jl

@@ -29,28 +29,21 @@ GLMakie.closeall()
 fig = Figure(size=(1200,800))
 
 stepRange = 0:1:50
-hSlider = Slider(fig[2, :], range = stepRange, startvalue = 0,linewidth=30)
+ax1 = AxisGeom(fig[1, 1],  title = "V = V + N*0")
+hp1 = meshplot!(ax1, F1, V1)
 
-titleString = lift(hSlider.value) do stepIndex
-    "V = V + N*" * string(stepIndex) 
-end
+ax2 = AxisGeom(fig[1, 2],  title = "V = V + N*0")
+hp2 = meshplot!(ax2, F2, V2)
 
-M1 = lift(hSlider.value) do stepIndex
-    V1n = [V1[i].+ stepIndex.*NV1[i] for i ∈ eachindex(V1)]
-    return GeometryBasics.Mesh(V1n,F1)
-end
+hSlider = Slider(fig[2, :], range = stepRange, startvalue = 0,linewidth=30)
 
-M2 = lift(hSlider.value) do stepIndex
+on(hSlider.value) do stepIndex    
+    ax1.title ="V = V + N*" * string(stepIndex) 
+    ax2.title ="V = V + N*" * string(stepIndex) 
+    V1n = [V1[i].+ stepIndex.*NV1[i] for i ∈ eachindex(V1)]
     V2n = [V2[i].+ stepIndex.*NV2[i] for i ∈ eachindex(V2)]
-    return GeometryBasics.Mesh(V2n,F2)
+    hp1[1] = GeometryBasics.Mesh(V1n, F1)
+    hp2[1] = GeometryBasics.Mesh(V2n, F2)
 end
 
-ax1 = AxisGeom(fig[1, 1],  title = titleString)
-poly!(ax1,M1,strokewidth=2,color=:white, shading = FastShading)
-
-ax2 = AxisGeom(fig[1, 2],  title = titleString)
-poly!(ax2,M2,strokewidth=2,color=:white, shading = FastShading)
-
-fig[2, :]=hSlider
-
 fig

examples/demo_surfacevol.jl

@@ -6,20 +6,22 @@ using FileIO
 for testCase = 1:5
     if testCase == 1 # Triangulated sphere
         r = 1
-        F,V = geosphere(3,r)  
+        nSub = 5
+        F, V = geosphere(nSub, r)  
         println("Theoretical volume: " * string(4/3*pi*r^3))    
     elseif testCase == 2 # quad sphere 
         r = 1.0
-        F,V = quadsphere(5,r)    
+        pointSpacing = r/20.0
+        F, V = quadsphere(r, pointSpacing)    
         println("Theoretical volume: " * string(4/3*pi*r^3))    
     elseif testCase == 3 # quad cube
         r = 2*sqrt(3)/2
-        F,V = cube(r)    
+        F, V = cube(r)    
         println("Theoretical volume: " * string((2*(r./(sqrt(3))))^3))
     elseif testCase == 4 # triangulated cube
         r = 2*sqrt(3)/2
-        F,V = cube(r)    
-        F = quad2tri(F,V; convert_method = :angle)
+        F, V = cube(r)    
+        F = quad2tri(F, V; convert_method = :angle)
         println("Theoretical volume: " * string((2*(r./(sqrt(3))))^3))
     elseif testCase == 5 # Merged STL for single object
         # Loading a mesh
@@ -29,7 +31,7 @@ for testCase = 1:5
         # Obtain mesh faces and vertices
         F = tofaces(faces(M))
         V = topoints(coordinates(M))
-        F,V,_ = mergevertices(F,V)
+        F, V, _ = mergevertices(F,V)
     end
 
     vol = surfacevolume(F,V)

examples/example_checker.jl

@@ -1,6 +1,5 @@
 module ExampleChecker
-
-const NUMTASKS = 10
+using Comodo
 
 function load_and_run!(filename::String, problems::Vector{String})::Bool
     #cmdline = "using Pkg; Pkg.activate(\"./..\"); include(\"$filename\")"
@@ -19,21 +18,19 @@ function load_and_run!(filename::String, problems::Vector{String})::Bool
     end
 end
 
-function main()
-    dircontent = readdir(".")
+function main()    
+    example_dir = joinpath(comododir(),"examples")
+    dircontent = readdir(example_dir)
     juliafiles = filter(x -> occursin(r"demo.*\.jl", x), dircontent)
-
-    problems = Vector{String}(undef, 0)
-    tasks = Task[]
-    for file in juliafiles
-        if length(tasks) >= NUMTASKS
-            wait.(tasks)
-            empty!(tasks)
-        end
+    
+    problems = Vector{String}(undef, 0)    
+    for file in juliafiles        
         println("Checking file: $file")
-        t = Task(() -> load_and_run!(file, problems))
-        push!(tasks, t)
-        schedule(t)
+        t = Task(() -> load_and_run!(joinpath(example_dir, file), problems))
+        schedule(t)        
+        while !istaskdone(t)  # Wait for task completion                  
+            sleep(1)
+        end
     end
 
     if !isempty(problems)

src/functions.jl

@@ -2532,7 +2532,7 @@ function subquadsphere(n::Int,r::T) where T <: Real
 end
 
 """
-    quadsphere(r,pointSpacing)
+    quadsphere(r, pointSpacing)
 
 Returns a quadrangulated sphere
 
@@ -2543,7 +2543,7 @@ approximate point spacing (which is most accurate for regions away from the
 original cube corners. The ouput consists of the faces `F`, the vertices `V`, 
 and the underlying cube face boundary labels `C`. 
 """
-function quadsphere(r,pointSpacing)
+function quadsphere(r, pointSpacing)
     boxDim = fill(2.0,3)#fill(r/2.0,3) # Dimensions for the box in each direction
     boxEl = fill(ceil.(Int,(r*π/2.0)./pointSpacing),3) # Number of elements to use in each direction 
     F,V,C = quadbox(boxDim,boxEl)