From 17af7ebe7596cc0ccfa28929f3bbbe1a4605c6bd Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Mon, 30 Jun 2025 14:58:08 +0200 Subject: [PATCH 1/8] Remove FileIO dependency --- Project.toml | 2 -- README.md | 8 +++----- test/runtests.jl | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Project.toml b/Project.toml index a26110d..c814985 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,6 @@ authors = ["Alberto F. Martín ", "Eric Neiva ] -pkg> add Gridap, GridapMakie, GLMakie, FileIO +pkg> add Gridap, GridapMakie, GLMakie ``` ## Examples -First things first, we shall be using the three packages as well as `FileIO`. +First things first, we shall be using the three packages. We may as well create directories to store downloaded meshes and output files ````julia using Gridap, GridapMakie, GLMakie -using FileIO mkdir("models") mkdir("images") ```` diff --git a/test/runtests.jl b/test/runtests.jl index 21a22cc..dca3c03 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,8 +5,6 @@ using Gridap using GLMakie using Test -import FileIO - const OUTDIR = joinpath(@__DIR__, "output") rm(OUTDIR, force=true, recursive=true) mkpath(OUTDIR) @@ -17,7 +15,7 @@ function savefig(f, suffix::String) filename = "$(suffix).png" @show filename path = joinpath(OUTDIR, filename) - FileIO.save(path, fig) + save(path, fig) return true end From 6a64ef66a04f3abe134436755b5ed8a4c89585fd Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Mon, 30 Jun 2025 14:58:58 +0200 Subject: [PATCH 2/8] Simplify MeshField recipe --- src/recipes.jl | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/src/recipes.jl b/src/recipes.jl index 221fb38..63b001f 100644 --- a/src/recipes.jl +++ b/src/recipes.jl @@ -23,36 +23,12 @@ function setup_face_color(color::AbstractArray, grid::Grid, face_to_cell) end @Makie.recipe MeshField begin - linewidth = @inherit linewidth - linecap = @inherit linecap - joinstyle = @inherit joinstyle - linestyle = nothing - miter_limit = @inherit miter_limit - cycle = nothing - uv_transform = Makie.automatic - matcap = nothing - marker = @inherit marker - markersize = @inherit markersize - strokecolor = @inherit markerstrokecolor - strokewidth = @inherit markerstrokewidth - glowcolor = (:black, 0.0) - glowwidth = 0.0 - rotation = Makie.Billboard() - marker_offset = Makie.Vec3f(0) - font = @inherit markerfont - distancefield = nothing - interpolate = true - font = "default" - uv_offset_width = (0.0, 0.0, 0.0, 0.0) - markerspace = :pixel - depthsorting = false - Makie.mixin_generic_plot_attributes()... - Makie.mixin_colormap_attributes()... - Makie.mixin_shading_attributes()... + Makie.DocumentedAttributes(merge(Makie.documented_attributes(Makie.Mesh).d,Makie.documented_attributes(Makie.LineSegments).d,Makie.documented_attributes(Makie.Scatter).d))... fxaa = false shading = Makie.NoShading colormap = :bluesreds color = :pink + cycle = nothing end Makie.plottype(::Triangulation{<:Any,1}) = Makie.Scatter @@ -62,6 +38,11 @@ Makie.plottype(::Triangulation,::Any) = MeshField Makie.plottype(c::CellField) = Makie.plottype(get_triangulation(c),c) Makie.args_preferred_axis(::Triangulation{<:Any,Dp}) where Dp = Dp<=2 ? Makie.Axis : Makie.LScene +function Makie.convert_arguments(::Type{<:Makie.Wireframe}, trian::Triangulation{<:Any,1}) + x=to_point1D(trian) + return (x[1],x[2],zeros(length(x[1]),length(x[1]))) +end + function Makie.convert_arguments(::Type{<:Makie.Wireframe}, trian::Triangulation) grid = to_grid(trian) mesh = to_plot_mesh(grid) @@ -79,20 +60,15 @@ function Makie.convert_arguments(::Type{<:MeshField}, c::CellField) (get_triangulation(c), c) end -function Makie.convert_arguments(::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, c::CellField) - trian=get_triangulation(c) - if num_point_dims(trian)==1 - return to_point1D(trian, c) - else - @unreachable - end +function Makie.convert_arguments(t::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, c::CellField) + Makie.convert_arguments(t,get_triangulation(c), c) end -function Makie.convert_arguments(::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, trian::Triangulation{Dc,1}, uh::Any) where Dc +function Makie.convert_arguments(::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, trian::Triangulation{<:Any,1}, uh::Any) return to_point1D(trian, uh) end -function Makie.convert_arguments(::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, trian::Triangulation{Dc,1}) where Dc +function Makie.convert_arguments(::Union{Type{Makie.Lines},Type{Makie.ScatterLines},Type{Makie.Scatter}}, trian::Triangulation{<:Any,1}) return to_point1D(trian) end @@ -190,11 +166,11 @@ function Makie.plot!(p::MeshField{<:Tuple{Triangulation{3,<:Any}}}) Makie.mesh!(p, p.attributes, p.mesh,color=p.newcolor) end -function Makie.plot!(p::MeshField{<:Tuple{Triangulation, Any}}) +function Makie.plot!(::MeshField{<:Tuple{Triangulation, Any}}) @unreachable end -function Makie.plot!(p::MeshField{<:Tuple{Triangulation}}) +function Makie.plot!(::MeshField{<:Tuple{Triangulation}}) @unreachable end From a971b64349cc51ad1621699e7f5ea89aa9e99193 Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Mon, 30 Jun 2025 15:07:30 +0200 Subject: [PATCH 3/8] Bump to Julia 1.10 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index c814985..3f0195a 100644 --- a/Project.toml +++ b/Project.toml @@ -16,7 +16,7 @@ GLMakie = "0.13" GeometryBasics = "0.5" Gridap = "0.16, 0.17, 0.18, 0.19" Makie = "0.24" -julia = "1.6" +julia = "1.10" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" From e6e645c0a0afbd019978a9c8b74636eedc156671 Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Sat, 21 Mar 2026 08:00:04 +0100 Subject: [PATCH 4/8] Update Project.toml Add support to gridap 0.20 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 3f0195a..44ee4d1 100644 --- a/Project.toml +++ b/Project.toml @@ -14,7 +14,7 @@ Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" FillArrays = "1" GLMakie = "0.13" GeometryBasics = "0.5" -Gridap = "0.16, 0.17, 0.18, 0.19" +Gridap = "0.16, 0.17, 0.18, 0.19, 0.20" Makie = "0.24" julia = "1.10" From e884b931c564c6e5744045a5a5c787108354b26f Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Sat, 21 Mar 2026 09:49:30 +0100 Subject: [PATCH 5/8] Update 3d json model --- README.md | 6 +++++- _readme/models/model_0.16.json | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 _readme/models/model_0.16.json diff --git a/README.md b/README.md index c304eea..738a7eb 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,11 @@ take the mesh from the [first Gridap tutorial](https://gridap.github.io/Tutorial which can be downloaded using ````julia -url = "https://github.com/gridap/GridapMakie.jl/raw/d5d74190e68bd310483fead8a4154235a61815c5/_readme/model.json" +if pkgversion(Gridap) Date: Sat, 21 Mar 2026 10:07:18 +0100 Subject: [PATCH 6/8] Bump to version 0.1.8 --- NEWS.md | 7 +++++++ Project.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index de3303e..99747d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.1.8] - 2026-03-21 + +### Added + +- Updated to support Gridap 0.20 +- Remove FileIO dependency + ## [0.1.7] - 2025-06-25 ### Added diff --git a/Project.toml b/Project.toml index 44ee4d1..ebf6063 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "GridapMakie" uuid = "41f30b06-6382-4b60-a5f7-79d86b35bf5d" authors = ["Alberto F. Martín ", "Eric Neiva ", "Pau Riera ", "Francesc Verdugo ", "Jan Weidner ", "Other contributors"] -version = "0.1.7" +version = "0.1.8" [deps] FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b" From 210deb232a3999d74437a7e3b8fa647b9f9067d9 Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Sat, 21 Mar 2026 10:11:19 +0100 Subject: [PATCH 7/8] Update NEWS.md --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 99747d9..85b7ba9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated to support Gridap 0.20 - Remove FileIO dependency +- Raise Julia minimum compatibility to 1.10 ## [0.1.7] - 2025-06-25 From 84e09e8c1579591f21c473f661cb52b033bc6237 Mon Sep 17 00:00:00 2001 From: Olivier Vanvincq Date: Sun, 22 Mar 2026 08:12:13 +0100 Subject: [PATCH 8/8] Fix for doc --- docs/make.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/make.jl b/docs/make.jl index 2f05c18..03cc174 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -9,6 +9,7 @@ makedocs(; repo="https://github.com/gridap/GridapMakie.jl/blob/{commit}{path}#L{line}", sitename="GridapMakie.jl", authors="The GridapMakie project contributors", + warnonly=true, ) deploydocs(;