From 0c0ac35181a2284f858ee5fba5b40aeeb69f9103 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Sat, 18 May 2024 00:13:55 +0000 Subject: [PATCH 1/3] CompatHelper: bump compat for BlockArrays to 1, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 3ee248317..9b71c63e9 100644 --- a/Project.toml +++ b/Project.toml @@ -33,7 +33,7 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192" [compat] AbstractTrees = "0.3.3, 0.4" BSON = "0.2.5, 0.3" -BlockArrays = "0.12.12, 0.13, 0.14, 0.15, 0.16" +BlockArrays = "0.12.12, 0.13, 0.14, 0.15, 0.16, 1" Combinatorics = "1.0.0" DataStructures = "0.18.13" DocStringExtensions = "0.8.1, 0.9" From 5bce78fdb32392343ad9357274e2004f5d9ab7db Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Mon, 9 Sep 2024 00:17:11 +0000 Subject: [PATCH 2/3] CompatHelper: bump compat for JLD2 to 0.5, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index ed525ebbd..540d53294 100644 --- a/Project.toml +++ b/Project.toml @@ -42,7 +42,7 @@ FastGaussQuadrature = "0.4.2, 1" FileIO = "1.2.2, 1.3, 1.4" FillArrays = "0.8.4, 0.9, 0.10, 0.11, 0.12, 0.13, 1" ForwardDiff = "0.10.10" -JLD2 = "0.1.11, 0.3, 0.4" +JLD2 = "0.1.11, 0.3, 0.4, 0.5" JSON = "0.21.0" LineSearches = "7.0.1" NLsolve = "4.3.0" From c082fafa95ab0bbcf6d5c1f0034af98443d04494 Mon Sep 17 00:00:00 2001 From: JordiManyer Date: Thu, 7 Nov 2024 10:41:49 +1100 Subject: [PATCH 3/3] Fixed issues with BlockArrays 1.0 --- src/Algebra/Algebra.jl | 1 + src/Algebra/AlgebraInterfaces.jl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Algebra/Algebra.jl b/src/Algebra/Algebra.jl index 72f2782ac..46a520f35 100644 --- a/src/Algebra/Algebra.jl +++ b/src/Algebra/Algebra.jl @@ -18,6 +18,7 @@ using Gridap.Helpers import Base: convert, size, getindex, show, count, * import LinearAlgebra: mul! import SparseArrays: nnz, nonzeros, nzrange, findnz, rowvals +import BlockArrays: AbstractBlockedUnitRange export length_to_ptrs! export rewind_ptrs! diff --git a/src/Algebra/AlgebraInterfaces.jl b/src/Algebra/AlgebraInterfaces.jl index 7548cd9cb..44298b2f8 100644 --- a/src/Algebra/AlgebraInterfaces.jl +++ b/src/Algebra/AlgebraInterfaces.jl @@ -40,7 +40,7 @@ function allocate_vector(::Type{V},n::Integer) where V V(undef,n) end -function allocate_vector(::Type{<:BlockVector{T,VV}},indices::BlockedUnitRange) where {T,VV} +function allocate_vector(::Type{<:BlockVector{T,VV}},indices::AbstractBlockedUnitRange) where {T,VV} V = eltype(VV) mortar(map(ids -> allocate_vector(V,ids),blocks(indices))) end