diff --git a/Project.toml b/Project.toml index d185b8358..e7c681a17 100644 --- a/Project.toml +++ b/Project.toml @@ -35,7 +35,7 @@ WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192" AbstractTrees = "0.3.3, 0.4" Aqua = "0.8" 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" 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