Skip to content

Revert "Revert "Extended NothingBC and MultiFieldBC"" #71

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

Merged
merged 1 commit into from
Nov 12, 2025
Merged

Revert "Revert "Extended NothingBC and MultiFieldBC"" #71

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/ComputationalModels/BoundaryConditions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ struct MultiFieldBC <: BoundaryCondition
BoundaryCondition::Vector{BoundaryCondition}
end

getindex(bc::MultiFieldBC, i) = bc.BoundaryCondition[i]

include("EvolutionFunctions.jl")
include("CartesianTags.jl")

Expand Down
1 change: 1 addition & 0 deletions src/ComputationalModels/ComputationalModels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ using WriteVTK
using GridapGmsh
using GridapGmsh: GmshDiscreteModel

import Base.getindex

include("BoundaryConditions.jl")
export DirichletBC
Expand Down
23 changes: 8 additions & 15 deletions src/ComputationalModels/FESpaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,23 @@ end

function Gridap.FESpaces.TrialFESpace!(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64)
@inbounds for (i, space) in enumerate(space.spaces)
TrialFESpace!(space, bc.BoundaryCondition[i], Λ)
TrialFESpace!(space, bc[i], Λ)
end
end

function Gridap.FESpaces.TrialFESpace!(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64, ΔΛ::Float64)
@inbounds for (i, space) in enumerate(space.spaces)
TrialFESpace!(space, bc.BoundaryCondition[i], Λ, ΔΛ)
TrialFESpace!(space, bc[i], Λ, ΔΛ)
end
end

function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC)
TrialFESpace(space, bc, 0.0)
end

function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC)
TrialFESpace(space, bc, 0.0)
end


function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, ::NothingBC, Λ::Float64)
function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, ::NothingBC, Λ::Float64=0.0)
space
end

function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64)

function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64=0.0)
trialspace= TrialFESpace(space, map(f -> f(Λ), bc.values))
@inbounds for i in eachindex(bc.tags)
if bc.caches[i] isa InterpolableBC
Expand All @@ -78,13 +71,13 @@ function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC
return trialspace
end

function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64)

function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64=0.0)
U_ = Vector{Union{TrialFESpace,UnconstrainedFESpace}}(undef, length(space))
@inbounds for (i, space) in enumerate(space.spaces)
U_[i] = TrialFESpace(space, bc.BoundaryCondition[i], Λ)
U_[i] = TrialFESpace(space, bc[i], Λ)
end
return MultiFieldFESpace(U_)

end


Expand Down