Skip to content

Commit

Permalink
Merge pull request #1007 from gridap/compathelper/new_version/2024-05…
Browse files Browse the repository at this point in the history
…-18-00-13-50-581-03011731987

CompatHelper: bump compat for BlockArrays to 1, (keep existing compat)
  • Loading branch information
JordiManyer authored Nov 7, 2024
2 parents 1238f16 + e2cc44a commit 6071a90
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/Algebra/Algebra.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion src/Algebra/AlgebraInterfaces.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6071a90

Please sign in to comment.