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

CellFE constructor now gets optional arguments and pass them down #728

Merged
merged 6 commits into from
Dec 3, 2021
Merged

CellFE constructor now gets optional arguments and pass them down #728

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
278185a
Modified all FESpace constructors and the functions down the tree
amartinhuertas Dec 2, 2021
4181d69
Merge branch 'no_explicit_inline' of github.com:gridap/Gridap.jl into…
amartinhuertas Dec 2, 2021
c24afc3
Merge branch 'master' of github.com:gridap/Gridap.jl into passing_cel…
fverdugo Dec 2, 2021
6ed899f
Merge branch 'master' of github.com:gridap/Gridap.jl into passing_cel…
amartinhuertas Dec 2, 2021
997cf67
Merge branch 'passing_cellfe_optargs' of github.com:gridap/Gridap.jl …
amartinhuertas Dec 2, 2021
e8c1cd1
Restricting arbitrary optional args to CellFE constructor
amartinhuertas Dec 3, 2021
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
7 changes: 4 additions & 3 deletions src/FESpaces/ConformingFESpaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ Generate a CellFE from a vector of reference fes
function CellFE(
model::DiscreteModel,
cell_reffe::AbstractArray{<:ReferenceFE},
conformity::Conformity
conformity::Conformity,
cell_fe_args...
amartinhuertas marked this conversation as resolved.
Show resolved Hide resolved
)
cell_conformity = CellConformity(cell_reffe,conformity)
ctype_reffe, cell_ctype = compress_cell_data(cell_reffe)
ctype_num_dofs = map(num_dofs,ctype_reffe)
ctype_ldof_comp = map(reffe->get_dof_to_comp(reffe),ctype_reffe)
cell_shapefuns = get_cell_shapefuns(model,cell_reffe,conformity)
cell_dof_basis = get_cell_dof_basis(model,cell_reffe,conformity)
cell_shapefuns = get_cell_shapefuns(model,cell_reffe,conformity,cell_fe_args...)
cell_dof_basis = get_cell_dof_basis(model,cell_reffe,conformity,cell_fe_args...)
cell_shapefuns_domain = ReferenceDomain()
cell_dof_basis_domain = cell_shapefuns_domain
max_order = maximum(map(get_order,ctype_reffe))
Expand Down
14 changes: 10 additions & 4 deletions src/FESpaces/DivConformingFESpaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ struct TransformRTDofBasis{Dc,Dp} <: Map end ;

function get_cell_dof_basis(model::DiscreteModel,
cell_reffe::AbstractArray{<:GenericRefFE{RaviartThomas}},
::DivConformity)
sign_flip = get_sign_flip(model, cell_reffe)
::DivConformity,
sign_flip=nothing)
if (sign_flip==nothing)
amartinhuertas marked this conversation as resolved.
Show resolved Hide resolved
sign_flip = get_sign_flip(model, cell_reffe)
end
cell_map = get_cell_map(Triangulation(model))
phi = cell_map[1]
Jt = lazy_map(Broadcasting(∇),cell_map)
Expand All @@ -46,8 +49,11 @@ end

function get_cell_shapefuns(model::DiscreteModel,
cell_reffe::AbstractArray{<:GenericRefFE{RaviartThomas}},
::DivConformity)
sign_flip = get_sign_flip(model, cell_reffe)
::DivConformity,
sign_flip=nothing)
amartinhuertas marked this conversation as resolved.
Show resolved Hide resolved
if (sign_flip==nothing)
sign_flip = get_sign_flip(model, cell_reffe)
end
cell_reffe_shapefuns=lazy_map(get_shapefuns,cell_reffe)
k=ContraVariantPiolaMap()
lazy_map(k,
Expand Down
22 changes: 14 additions & 8 deletions src/FESpaces/FESpaceFactories.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,21 @@ end

function FESpace(
t::Triangulation,
cell_reffe::AbstractArray{<:ReferenceFE};
cell_reffe::AbstractArray{<:ReferenceFE},
amartinhuertas marked this conversation as resolved.
Show resolved Hide resolved
cell_fe_args...;
trian=nothing,
kwargs...)
@assert trian === nothing
# TODO for L2 conformity and no dirichlet conditions
# no needed to build the active model
model = get_active_model(t)
FESpace(model,cell_reffe;trian=t,kwargs...)
FESpace(model,cell_reffe,cell_fe_args...;trian=t,kwargs...)
end

function FESpace(
model::DiscreteModel,
cell_reffe::AbstractArray{<:ReferenceFE};
cell_reffe::AbstractArray{<:ReferenceFE},
cell_fe_args...;
conformity=nothing,
trian = Triangulation(model),
labels = get_face_labeling(model),
Expand All @@ -102,7 +104,7 @@ function FESpace(
return V
end

cell_fe = CellFE(model,cell_reffe,conf)
cell_fe = CellFE(model,cell_reffe,conf,cell_fe_args...)
_vector_type = _get_vector_type(vector_type,cell_fe,trian)
if conformity in (L2Conformity(),:L2) && dirichlet_tags == Int[]
F = _DiscontinuousFESpace(_vector_type,trian,cell_fe)
Expand All @@ -119,15 +121,19 @@ function FESpace(
return V
end

function FESpace(model::DiscreteModel, reffe::Tuple{<:ReferenceFEName,Any,Any}; kwargs...)
function FESpace(model::DiscreteModel,
reffe::Tuple{<:ReferenceFEName,Any,Any},
cell_fe_args...; kwargs...)
basis, reffe_args,reffe_kwargs = reffe
cell_reffe = ReferenceFE(model,basis,reffe_args...;reffe_kwargs...)
FESpace(model,cell_reffe;kwargs...)
FESpace(model,cell_reffe,cell_fe_args...;kwargs...)
end

function FESpace(model::DiscreteModel, reffe::ReferenceFE; kwargs...)
function FESpace(model::DiscreteModel,
reffe::ReferenceFE,
cell_fe_args...; kwargs...)
cell_reffe = Fill(reffe,num_cells(model))
FESpace(model,cell_reffe;kwargs...)
FESpace(model,cell_reffe,cell_fe_args...;kwargs...)
end

"""
Expand Down