Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Add cell to CellCache #1060

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: Add cell to CellCache #1060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions src/iterators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
nodes::Bool
coords::Bool
dofs::Bool
cell::Bool
end

UpdateFlags(; nodes::Bool=true, coords::Bool=true, dofs::Bool=true) =
UpdateFlags(nodes, coords, dofs)
UpdateFlags(; nodes::Bool=true, coords::Bool=true, dofs::Bool=true, cell::Bool=true) =
UpdateFlags(nodes, coords, dofs, cell)


###############
Expand Down Expand Up @@ -37,13 +38,14 @@

See also [`CellIterator`](@ref).
"""
mutable struct CellCache{X,G<:AbstractGrid,DH<:Union{AbstractDofHandler,Nothing}}
mutable struct CellCache{X,G<:AbstractGrid,DH<:Union{AbstractDofHandler,Nothing}, CT}
const flags::UpdateFlags
const grid::G
# Pretty useless to store this since you have it already for the reinit! call, but
# needed for the CellIterator(...) workflow since the user doesn't necessarily control
# the loop order in the cell subset.
cellid::Int
cell::CT
const nodes::Vector{Int}
const coords::Vector{X}
const dh::DH
Expand All @@ -54,7 +56,7 @@
N = nnodes_per_cell(grid, 1) # nodes and coords will be resized in `reinit!`
nodes = zeros(Int, N)
coords = zeros(Vec{dim,T}, N)
return CellCache(flags, grid, -1, nodes, coords, nothing, Int[])
return CellCache(flags, grid, -1, nothing, nodes, coords, nothing, Int[])
end

function CellCache(dh::DofHandler{dim}, flags::UpdateFlags=UpdateFlags()) where {dim}
Expand All @@ -63,12 +65,14 @@
nodes = zeros(Int, N)
coords = zeros(Vec{dim, get_coordinate_eltype(get_grid(dh))}, N)
celldofs = zeros(Int, n)
return CellCache(flags, get_grid(dh), -1, nodes, coords, dh, celldofs)
return CellCache(flags, get_grid(dh), -1, nothing, nodes, coords, dh, celldofs)
end

function CellCache(sdh::SubDofHandler, flags::UpdateFlags=UpdateFlags())
Tv = get_coordinate_type(sdh.dh.grid)
CellCache(flags, sdh.dh.grid, -1, Int[], Tv[], sdh, Int[])
n = nnodes_per_cell(sdh.dh.grid, first(sdh.cellset))
cell = getcelltype(sdh)(ntuple(i -> -1, n))
CellCache(flags, sdh.dh.grid, -1, cell, Int[], Tv[], sdh, Int[])
end

function reinit!(cc::CellCache, i::Int)
Expand All @@ -85,12 +89,28 @@
resize!(cc.dofs, ndofs_per_cell(cc.dh, i))
celldofs!(cc.dofs, cc.dh, i)
end
if cc.cell !== nothing && cc.flags.cell
cc.cell = getcells(cc.grid, i)
end
return cc
end

# reinit! FEValues with CellCache
reinit!(cv::CellValues, cc::CellCache) = reinit!(cv, cc.coords)
reinit!(fv::FacetValues, cc::CellCache, f::Int) = reinit!(fv, cc.coords, f) # TODO: Deprecate?
function reinit!(cv::CellValues, cc::CellCache)
if cc.cell === nothing
reinit!(cv, cc.coords)
else
reinit!(cv, cc.cell, cc.coords)
end
end

function reinit!(fv::FacetValues, cc::CellCache, f::Int) # TODO: Deprecate?
if cc.cell === nothing
reinit!(fv, cc.coords, f)
else
reinit!(fv, cc.cell, cc.coords, f)

Check warning on line 111 in src/iterators.jl

View check run for this annotation

Codecov / codecov/patch

src/iterators.jl#L111 

Added line #L111 was not covered by tests
end
end

# Accessor functions (TODO: Deprecate? We are so inconsistent with `getxx` vs `xx`...)
getnodes(cc::CellCache) = cc.nodes
Expand Down