diff --git a/src/FESpaces/ConformingFESpaces.jl b/src/FESpaces/ConformingFESpaces.jl index 82a2404f0..7bc44f143 100644 --- a/src/FESpaces/ConformingFESpaces.jl +++ b/src/FESpaces/ConformingFESpaces.jl @@ -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, + args... ) 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,args...) + cell_dof_basis = get_cell_dof_basis(model,cell_reffe,conformity,args...) cell_shapefuns_domain = ReferenceDomain() cell_dof_basis_domain = cell_shapefuns_domain max_order = maximum(map(get_order,ctype_reffe)) diff --git a/src/FESpaces/DivConformingFESpaces.jl b/src/FESpaces/DivConformingFESpaces.jl index 201a322a4..85697b73b 100644 --- a/src/FESpaces/DivConformingFESpaces.jl +++ b/src/FESpaces/DivConformingFESpaces.jl @@ -28,8 +28,8 @@ 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=get_sign_flip(model, cell_reffe)) cell_map = get_cell_map(Triangulation(model)) phi = cell_map[1] Jt = lazy_map(Broadcasting(∇),cell_map) @@ -46,8 +46,8 @@ end function get_cell_shapefuns(model::DiscreteModel, cell_reffe::AbstractArray{<:GenericRefFE{RaviartThomas}}, - ::DivConformity) - sign_flip = get_sign_flip(model, cell_reffe) + ::DivConformity, + sign_flip=get_sign_flip(model, cell_reffe)) cell_reffe_shapefuns=lazy_map(get_shapefuns,cell_reffe) k=ContraVariantPiolaMap() lazy_map(k, diff --git a/src/FESpaces/FESpaceFactories.jl b/src/FESpaces/FESpaceFactories.jl index fa67bae28..301bea426 100644 --- a/src/FESpaces/FESpaceFactories.jl +++ b/src/FESpaces/FESpaceFactories.jl @@ -119,13 +119,15 @@ function FESpace( return V end -function FESpace(model::DiscreteModel, reffe::Tuple{<:ReferenceFEName,Any,Any}; kwargs...) +function FESpace(model::DiscreteModel, + reffe::Tuple{<:ReferenceFEName,Any,Any}; kwargs...) basis, reffe_args,reffe_kwargs = reffe cell_reffe = ReferenceFE(model,basis,reffe_args...;reffe_kwargs...) FESpace(model,cell_reffe;kwargs...) end -function FESpace(model::DiscreteModel, reffe::ReferenceFE; kwargs...) +function FESpace(model::DiscreteModel, + reffe::ReferenceFE; kwargs...) cell_reffe = Fill(reffe,num_cells(model)) FESpace(model,cell_reffe;kwargs...) end