diff --git a/Project.toml b/Project.toml index 6eebfc0c..ca6464d3 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ExtendableGrids" uuid = "cfc395e8-590f-11e8-1f13-43a2532b2fa8" authors = ["Juergen Fuhrmann ", "Christian Merdon ", "Johannes Taraz "] -version = "1.6.0" +version = "1.6.1" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" diff --git a/docs/Project.toml b/docs/Project.toml index d9c84172..57074a05 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -13,3 +13,4 @@ Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344" Documenter = "1" julia = "1.9" ExampleJuggler = "2" +CairoMakie = "0.12" diff --git a/docs/make.jl b/docs/make.jl index 653374b7..85102855 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,6 +1,6 @@ using Documenter, ExtendableGrids, ExampleJuggler, Gmsh import CairoMakie -CairoMakie.activate!(; type = "svg", visible = false) +CairoMakie.activate!(; type = "png", visible = false) ExampleJuggler.verbose!(true) ExtendableGridsGmshExt=Base.get_extension(ExtendableGrids, :ExtendableGridsGmshExt) function mkdocs() diff --git a/examples/examples1d.jl b/examples/examples1d.jl index 60a687e1..43215a6d 100644 --- a/examples/examples1d.jl +++ b/examples/examples1d.jl @@ -8,7 +8,7 @@ function interval_from_vector() X = collect(0:0.05:1) grid = simplexgrid(X) end -# ![](interval_from_vector.svg) +# ![](interval_from_vector.png) # # ## Interval with local refinement @@ -19,7 +19,7 @@ function interval_localref() X = glue(XLeft, XRight) grid = simplexgrid(X) end -# ![](interval_localref.svg) +# ![](interval_localref.png) # # ## Interval with multiple regions @@ -31,7 +31,7 @@ function interval_multiregion() bfacemask!(grid, [0.5], [0.5], 4) grid end -# ![](interval_multiregion.svg) +# ![](interval_multiregion.png) # # ## Multiple regions and subgrid # @@ -43,7 +43,7 @@ function interval_subgrid() cellmask!(grid, [0.20], [0.5], 3) subgrid(grid, [2, 3]) end -# ![](interval_subgrid.svg) +# ![](interval_subgrid.png) # ## CI callbacks for [ExampleJuggler.jl](https://github.com/j-fu/ExampleJuggler.jl) # Unit tests using Test @@ -61,9 +61,9 @@ function generateplots(picdir; Plotter = nothing) if isdefined(Plotter, :Makie) size = (500, 200) legend = :rt - Plotter.save(joinpath(picdir, "interval_from_vector.svg"), gridplot(interval_from_vector(); Plotter, size, legend)) - Plotter.save(joinpath(picdir, "interval_localref.svg"), gridplot(interval_localref(); Plotter, size, legend)) - Plotter.save(joinpath(picdir, "interval_multiregion.svg"), gridplot(interval_multiregion(); Plotter, size, legend)) - Plotter.save(joinpath(picdir, "interval_subgrid.svg"), gridplot(interval_subgrid(); Plotter, size, legend)) + Plotter.save(joinpath(picdir, "interval_from_vector.png"), gridplot(interval_from_vector(); Plotter, size, legend)) + Plotter.save(joinpath(picdir, "interval_localref.png"), gridplot(interval_localref(); Plotter, size, legend)) + Plotter.save(joinpath(picdir, "interval_multiregion.png"), gridplot(interval_multiregion(); Plotter, size, legend)) + Plotter.save(joinpath(picdir, "interval_subgrid.png"), gridplot(interval_subgrid(); Plotter, size, legend)) end end diff --git a/examples/examples2d.jl b/examples/examples2d.jl index 03dcff74..22d17d15 100644 --- a/examples/examples2d.jl +++ b/examples/examples2d.jl @@ -9,7 +9,7 @@ function rectangle() Y = collect(0:0.05:1) simplexgrid(X, X) end -# ![](rectangle.svg) +# ![](rectangle.png) # # ## Rectangle with local refinement # @@ -21,7 +21,7 @@ function rectangle_localref() X = glue(XLeft, XRight) simplexgrid(X, X) end -# ![](rectangle_localref.svg) +# ![](rectangle_localref.png) # # ## Rectangle with multiple regions @@ -35,7 +35,7 @@ function rectangle_multiregion() bfacemask!(grid, [1.0, 0.0], [1.0, 0.5], 6) bfacemask!(grid, [0.0, 0.5], [1.0, 0.5], 7) end -# ![](rectangle_multiregion.svg) +# ![](rectangle_multiregion.png) # # ## Subgrid from rectangle @@ -47,7 +47,7 @@ function rectangle_subgrid() rect!(grid, [0.25, 0.25], [0.75, 0.75]; region = 2, bregion = 5) subgrid(grid, [1]) end -# ![](rectangle_subgrid.svg) +# ![](rectangle_subgrid.png) # # ## Rect2d with bregion function @@ -64,7 +64,7 @@ function rect2d_bregion_function() subgrid(grid, [2]) end -# ![](rect2d_bregion_function.svg) +# ![](rect2d_bregion_function.png) function sorted_subgrid(; maxvolume = 0.01) builder = SimplexGridBuilder(; Generator = Triangulate) @@ -92,7 +92,7 @@ function sorted_subgrid(; maxvolume = 0.01) sf = view(f, sg) g, sg, sf end -# ![](sorted_subgrid.svg) +# ![](sorted_subgrid.png) # ## CI callbacks for [ExampleJuggler.jl](https://github.com/j-fu/ExampleJuggler.jl) # Unit tests using Test @@ -114,18 +114,18 @@ using GridVisualize function generateplots(picdir; Plotter = nothing) if isdefined(Plotter, :Makie) size = (300, 300) - Plotter.save(joinpath(picdir, "rectangle.svg"), gridplot(rectangle(); Plotter, size)) - Plotter.save(joinpath(picdir, "rectangle_localref.svg"), gridplot(rectangle_localref(); Plotter, size)) - Plotter.save(joinpath(picdir, "rectangle_multiregion.svg"), gridplot(rectangle_multiregion(); Plotter, size)) - Plotter.save(joinpath(picdir, "rectangle_subgrid.svg"), gridplot(rectangle_subgrid(); Plotter, size)) - Plotter.save(joinpath(picdir, "rect2d_bregion_function.svg"), gridplot(rect2d_bregion_function(); Plotter, size)) + Plotter.save(joinpath(picdir, "rectangle.png"), gridplot(rectangle(); Plotter, size)) + Plotter.save(joinpath(picdir, "rectangle_localref.png"), gridplot(rectangle_localref(); Plotter, size)) + Plotter.save(joinpath(picdir, "rectangle_multiregion.png"), gridplot(rectangle_multiregion(); Plotter, size)) + Plotter.save(joinpath(picdir, "rectangle_subgrid.png"), gridplot(rectangle_subgrid(); Plotter, size)) + Plotter.save(joinpath(picdir, "rect2d_bregion_function.png"), gridplot(rect2d_bregion_function(); Plotter, size)) g, sg, sf = sorted_subgrid() p = GridVisualizer(; Plotter, layout = (1, 3), size = (800, 300)) gridplot!(p[1, 1], g) gridplot!(p[1, 2], sg) scalarplot!(p[1, 3], sg, sf) - fname = joinpath(picdir, "sorted_subgrid.svg") + fname = joinpath(picdir, "sorted_subgrid.png") Plotter.save(fname, reveal(p)) end end diff --git a/examples/examples3d.jl b/examples/examples3d.jl index 49364f63..f2c4491f 100644 --- a/examples/examples3d.jl +++ b/examples/examples3d.jl @@ -10,7 +10,7 @@ function quadrilateral(; hx = 0.25, hy = 0.2, hz = 0.1) Z = collect(0:hz:1) simplexgrid(X, Y, Z) end -# ![](quadrilateral.svg) +# ![](quadrilateral.png) # ## Cross3d function cross3d() @@ -25,7 +25,7 @@ function cross3d() subgrid(grid, [2]) end -# ![](cross3d.svg) +# ![](cross3d.png) # ## CI callbacks for [ExampleJuggler.jl](https://github.com/j-fu/ExampleJuggler.jl) # Unit tests @@ -54,7 +54,7 @@ using GridVisualize function generateplots(picdir; Plotter = nothing) if isdefined(Plotter, :Makie) size = (400, 400) - Plotter.save(joinpath(picdir, "quadrilateral.svg"), gridplot(quadrilateral(); Plotter, size)) - Plotter.save(joinpath(picdir, "cross3d.svg"), gridplot(cross3d(); Plotter, size)) + Plotter.save(joinpath(picdir, "quadrilateral.png"), gridplot(quadrilateral(); Plotter, size)) + Plotter.save(joinpath(picdir, "cross3d.png"), gridplot(cross3d(); Plotter, size)) end end diff --git a/examples/gmsh.jl b/examples/gmsh.jl index 500fbdd0..e1abb3c3 100644 --- a/examples/gmsh.jl +++ b/examples/gmsh.jl @@ -40,7 +40,7 @@ function gmsh_t1() gmsh.finalize() grid end -# ![](gmsh_t1.svg) +# ![](gmsh_t1.png) # # [Example t4](https://gmsh.info/doc/texinfo/gmsh.html#t4) from the GMSH docs @@ -160,7 +160,7 @@ function gmsh_t4() grid end -# ![](gmsh_t4.svg) +# ![](gmsh_t4.png) # # [Example t5](https://gmsh.info/doc/texinfo/gmsh.html#t5) from the GMSH docs @@ -292,7 +292,7 @@ function gmsh_t5() gmsh.finalize() grid end -# ![](gmsh_t5.svg) +# ![](gmsh_t5.png) # ## CI callbacks for [ExampleJuggler.jl](https://github.com/j-fu/ExampleJuggler.jl) @@ -310,8 +310,8 @@ using GridVisualize function generateplots(picdir; Plotter = nothing) if isdefined(Plotter, :Makie) size = (500, 500) - Plotter.save(joinpath(picdir, "gmsh_t1.svg"), gridplot(gmsh_t1(); Plotter, size)) - Plotter.save(joinpath(picdir, "gmsh_t4.svg"), gridplot(gmsh_t4(); Plotter, size)) - Plotter.save(joinpath(picdir, "gmsh_t5.svg"), gridplot(gmsh_t5(); Plotter, size)) + Plotter.save(joinpath(picdir, "gmsh_t1.png"), gridplot(gmsh_t1(); Plotter, size)) + Plotter.save(joinpath(picdir, "gmsh_t4.png"), gridplot(gmsh_t4(); Plotter, size)) + Plotter.save(joinpath(picdir, "gmsh_t5.png"), gridplot(gmsh_t5(); Plotter, size)) end end