Fix dofmap for 1D problem

KeitaNakamura · Sep 21, 2024 · 788b3b6 · 788b3b6 · KeitaNakamura · Sep 21, 2024
1 parent 6145b75
commit 788b3b6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Tesserae"
 uuid = "fd374396-9d9c-4d88-9aa5-37a7f6105aca"
 authors = ["Keita Nakamura <keita.nakamura.1109@gmail.com>"]
-version = "0.1.12"
+version = "0.1.13"
 
 [deps]
 PoissonDiskSampling = "d57be0ce-7c7e-4f32-9a47-3bfb603400bb"

diff --git a/src/implicit.jl b/src/implicit.jl
@@ -43,22 +43,32 @@ struct DofMap{dim, N, I <: AbstractVector{CartesianIndex{N}}}
     dimension::Int
     gridsize::Dims{dim}
     indices::I # (direction, x, y, z)
+    function DofMap{dim, N, I}(dimension::Int, gridsize::Dims{dim}, indices::I) where {dim, N, I <: AbstractVector{CartesianIndex{N}}}
+        @assert dim+1 == N
+        new{dim, N, I}(dimension, gridsize, indices)
+    end
+end
+function DofMap(dimension::Int, gridsize::Dims{dim}, indices::I) where {dim, N, I <: AbstractVector{CartesianIndex{N}}}
+    DofMap{dim, N, I}(dimension, gridsize, indices)
 end
 
 DofMap(mask::AbstractArray{Bool}) = DofMap(size(mask, 1), Base.tail(size(mask)), findall(mask))
 DofMap(dims::Dims) = DofMap(dims[1], Base.tail(dims), vec(CartesianIndices(dims)))
 
 ndofs(dofmap::DofMap) = length(dofmap.indices)
 
+function (dofmap::DofMap{1, 2})(A::AbstractArray{T, 1}) where {T <: Vec}
+    A′ = reshape(reinterpret(eltype(T), A), 1, length(A))
+    @boundscheck checkbounds(A′, dofmap.indices)
+    @inbounds view(A′, dofmap.indices)
+end
 function (dofmap::DofMap{dim, N})(A::AbstractArray{T, dim}) where {dim, N, T <: Vec}
-    @assert dim+1 == N
     A′ = reinterpret(reshape, eltype(T), A)
     @boundscheck checkbounds(A′, dofmap.indices)
     @inbounds view(A′, dofmap.indices)
 end
 
 function (dofmap::DofMap{dim, N})(A::AbstractArray{T, dim}) where {dim, N, T <: Real}
-    @assert dim+1 == N
     A′ = reshape(A, 1, size(A)...)
     indices′ = maparray(I->CartesianIndex(1,Base.tail(Tuple(I))...), dofmap.indices)
     @boundscheck checkbounds(A′, indices′)