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

Use GeometryMapping in BCValues #859

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use GeometryMapping in BCValues #859

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1a20ba
Use GeometryMapping in BCValues
KnutAM Dec 11, 2023
c03fd54
Add linebreak at end of file
KnutAM Dec 11, 2023
8ac2946
Fix format suggestion
KnutAM Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Dofs/ConstraintHandler.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct ConstraintHandler{DH<:AbstractDofHandler,T}
dofcoefficients::Vector{Union{Nothing, DofCoefficients{T}}}
# global dof -> index into dofs and inhomogeneities and dofcoefficients
dofmapping::Dict{Int,Int}
bcvalues::Vector{BCValues{T}}
bcvalues::Vector{<:BCValues}
dh::DH
closed::ScalarWrapper{Bool}
end
Expand All @@ -97,7 +97,7 @@ function ConstraintHandler(::Type{T}, dh::AbstractDofHandler) where T <: Number
@assert isclosed(dh)
ConstraintHandler(
Dirichlet[], Int[], Int[], T[], Union{Nothing,T}[], Union{Nothing,DofCoefficients{T}}[],
Dict{Int,Int}(), BCValues{T}[], dh, ScalarWrapper(false),
Dict{Int,Int}(), BCValues[], dh, ScalarWrapper(false),
)
end

Expand Down Expand Up @@ -419,8 +419,8 @@ function _update!(inhomogeneities::Vector{T}, f::Function, boundary_entities::Se
reinit!(cc, cellidx)

# no need to reinit!, enough to update current_entity since we only need geometric shape functions M
boundaryvalues.current_entity[] = entityidx

set_current_face!(boundaryvalues, entityidx)
KnutAM marked this conversation as resolved.
Show resolved Hide resolved
# local dof-range for this face
r = local_face_dofs_offset[entityidx]:(local_face_dofs_offset[entityidx+1]-1)
counter = 1
Expand Down
51 changes: 21 additions & 30 deletions src/FEValues/FaceValues.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ function Base.show(io::IO, d::MIME"text/plain", fv::FaceValues)
end

"""
BCValues(func_interpol::Interpolation, geom_interpol::Interpolation, boundary_type::Union{Type{<:BoundaryIndex}})
BCValues([::Type{T},] func_interpol::Interpolation, geom_interpol::Interpolation, boundary_type::Union{Type{<:BoundaryIndex}})

`BCValues` stores the shape values at all faces/edges/vertices (depending on `boundary_type`) for the geomatric interpolation (`geom_interpol`),
for each dof-position determined by the `func_interpol`. Used mainly by the `ConstrainHandler`.
`BCValues` stores the shape values at all faces/edges/vertices (depending on `boundary_type`) for the geometric interpolation (`geom_interpol`),
for each dof-position determined by the `func_interpol`. Used mainly by the `ConstraintHandler`.
"""
struct BCValues{T}
M::Array{T,3}
nqp::Array{Int}
current_entity::ScalarWrapper{Int}
struct BCValues{V_GM, FQR} <: AbstractFaceValues
geo_mapping::V_GM # AbstractVector{GeometryMapping}
fqr::FQR # FaceQuadratureRule
current_face::ScalarWrapper{Int}
termi-official marked this conversation as resolved.
Show resolved Hide resolved
end

BCValues(func_interpol::Interpolation, geom_interpol::Interpolation, boundary_type::Type{<:BoundaryIndex} = Ferrite.FaceIndex) =
Expand All @@ -186,31 +186,22 @@ function BCValues(::Type{T}, func_interpol::Interpolation{refshape}, geom_interp
qrf = QuadratureRule{refshape,T}(fill(T(NaN), length(dofcoords)), dofcoords) # weights will not be used
push!(qrs, qrf)
end
fqr = FaceQuadratureRule(qrs)
geo_mapping = [GeometryMapping{0}(T, geom_interpol, qr) for qr in qrs]

n_boundary_entities = length(qrs)
n_qpoints = n_boundary_entities == 0 ? 0 : maximum(qr->length(getweights(qr)), qrs) # Bound number of qps correctly.
n_geom_basefuncs = getnbasefunctions(geom_interpol)
M = fill(zero(T) * T(NaN), n_geom_basefuncs, n_qpoints, n_boundary_entities)
nqp = zeros(Int,n_boundary_entities)
BCValues(geo_mapping, fqr, ScalarWrapper(1))
end

for n_boundary_entity in 1:n_boundary_entities
for (qp, ξ) in pairs(qrs[n_boundary_entity].points)
shape_values!(@view(M[:, qp, n_boundary_entity]), geom_interpol, ξ)
end
nqp[n_boundary_entity] = length(qrs[n_boundary_entity].points)
end
@inline nfaces(bcv::BCValues) = length(bcv.geo_mapping)
@inline getcurrentface(bcv) = bcv.current_face[]

BCValues{T}(M, nqp, ScalarWrapper(0))
function set_current_face!(bcv::BCValues, face_nr::Int)
# Checking face_nr before setting current_face allows @inbounds in getcurrentface(fv)
checkbounds(Bool, 1:nfaces(bcv), face_nr) || throw(ArgumentError("Face index out of range."))
bcv.current_face[] = face_nr
end

getnquadpoints(bcv::BCValues) = bcv.nqp[bcv.current_entity.x]
function spatial_coordinate(bcv::BCValues, q_point::Int, xh::AbstractVector{Vec{dim,T}}) where {dim,T}
n_base_funcs = size(bcv.M, 1)
length(xh) == n_base_funcs || throw_incompatible_coord_length(length(xh), n_base_funcs)
x = zero(Vec{dim,T})
face = bcv.current_entity[]
@inbounds for i in 1:n_base_funcs
x += bcv.M[i,q_point,face] * xh[i] # geometric_value(fe_v, q_point, i) * xh[i]
end
return x
end
@inline get_geo_mapping(bcv::BCValues) = @inbounds bcv.geo_mapping[getcurrentface(bcv)]
@inline geometric_value(bcv::BCValues, q_point::Int, base_func::Int) = geometric_value(get_geo_mapping(bcv), q_point, base_func)
@inline getngeobasefunctions(bcv::BCValues) = getngeobasefunctions(get_geo_mapping(bcv))
@inline getnquadpoints(bcv::BCValues) = @inbounds getnquadpoints(bcv.fqr, getcurrentface(bcv))
termi-official marked this conversation as resolved.
Show resolved Hide resolved