Mercurial > repos > public > sbplib_julia
changeset 1496:ae2dbfb984a9 feature/grids/curvilinear
Merge feature/grids/componentview
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Fri, 01 Dec 2023 15:01:44 +0100 |
parents | 64b58740e029 (current diff) 62f9d0387a2a (diff) |
children | 553111a15506 |
files | src/Grids/Grids.jl |
diffstat | 3 files changed, 74 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Grids/Grids.jl Fri Dec 01 12:23:59 2023 +0100 +++ b/src/Grids/Grids.jl Fri Dec 01 15:01:44 2023 +0100 @@ -14,10 +14,11 @@ export boundary_indices export boundary_identifiers export boundary_grid +export coarsen +export refine export eval_on -export coarsen -export getcomponent -export refine +export componentview +export ArrayComponentView export BoundaryIdentifier export TensorGridBoundary
--- a/src/Grids/grid.jl Fri Dec 01 12:23:59 2023 +0100 +++ b/src/Grids/grid.jl Fri Dec 01 15:01:44 2023 +0100 @@ -33,12 +33,45 @@ coordinate_size(g::Grid) = coordinate_size(typeof(g)) # TBD: Name of this function?! """ - component_type(g) + component_type(gf) + +The type of the components of `gf`. +""" +component_type(T::Type) = eltype(eltype(T)) +component_type(t) = component_type(typeof(t)) + +componentview(gf, component_index...) = ArrayComponentView(gf, component_index) + +struct ArrayComponentView{CT,T,D,AT <: AbstractArray{T,D}, IT} <: AbstractArray{CT,D} + v::AT + component_index::IT + + function ArrayComponentView(v, component_index) + CT = typeof(first(v)[component_index...]) + return new{CT, eltype(v), ndims(v), typeof(v), typeof(component_index)}(v,component_index) + end +end -The type of the components of the coordinate vector of `Grid` `g`. -""" -component_type(::Type{<:Grid{T}}) where T = eltype(T) -component_type(g::Grid) = component_type(typeof(g)) +Base.size(cv) = size(cv.v) +Base.getindex(cv::ArrayComponentView, i::Int) = cv.v[i][cv.component_index...] +Base.getindex(cv::ArrayComponentView, I::Vararg{Int}) = cv.v[I...][cv.component_index...] +IndexStyle(::Type{<:ArrayComponentView{<:Any,<:Any,AT}}) where AT = IndexStyle(AT) + +# TODO: Implement the remaining optional methods from the array interface +# setindex!(A, v, i::Int) +# setindex!(A, v, I::Vararg{Int, N}) +# iterate +# length(A) +# similar(A) +# similar(A, ::Type{S}) +# similar(A, dims::Dims) +# similar(A, ::Type{S}, dims::Dims) +# # Non-traditional indices +# axes(A) +# similar(A, ::Type{S}, inds) +# similar(T::Union{Type,Function}, inds) + +# TODO: Implement a more general ComponentView that can handle non-AbstractArrays. """ refine(g::Grid, r)
--- a/test/Grids/grid_test.jl Fri Dec 01 12:23:59 2023 +0100 +++ b/test/Grids/grid_test.jl Fri Dec 01 15:01:44 2023 +0100 @@ -63,6 +63,38 @@ @test eval_on(g, f) == map(x̄->f(x̄...), g) end +@testset "componentview" begin + v = [@SMatrix[1 3; 2 4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + + @test componentview(v, 1, 1) == [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, 1, 2) == [3 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, 2, 1) == [2 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + + @test componentview(v, 1, :) == [@SVector[1,3] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, 2, :) == [@SVector[2,4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, :, 1) == [@SVector[1,2] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, :, 2) == [@SVector[3,4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + + + A = @SMatrix[ + 1 4 7; + 2 5 8; + 3 6 9; + ] + v = [A .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, 1:2, 1:2) == [@SMatrix[1 4;2 5] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test componentview(v, 2:3, 1:2) == [@SMatrix[2 5;3 6] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] +end + +@testset "ArrayComponentView" begin + v = [@SMatrix[1 3; 2 4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + + @test ArrayComponentView(v, (1,1)) == ArrayComponentView(v, (1,1)) + @test ArrayComponentView(v, (1,1)) == ArrayComponentView(copy(v), (1,1)) + @test ArrayComponentView(v, (1,1)) == [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] + @test [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] == ArrayComponentView(v, (1,1)) +end + @testset "_ncomponents" begin @test Grids._ncomponents(Int) == 1 @test Grids._ncomponents(Float64) == 1