Merge pull request #69 from MultiSimOLab/revert-68-bc

Revert "Extended NothingBC and MultiFieldBC"

Author: miguelmaso

src/ComputationalModels/BoundaryConditions.jl

@@ -10,8 +10,6 @@ struct MultiFieldBC <: BoundaryCondition
     BoundaryCondition::Vector{BoundaryCondition}
 end
 
-getindex(bc::MultiFieldBC, i) = bc.BoundaryCondition[i]
-
 include("EvolutionFunctions.jl")
 include("CartesianTags.jl")
 

src/ComputationalModels/ComputationalModels.jl

@@ -34,7 +34,6 @@ using WriteVTK
 using GridapGmsh 
 using GridapGmsh: GmshDiscreteModel
 
-import Base.getindex
 
 include("BoundaryConditions.jl")
 export DirichletBC

src/ComputationalModels/FESpaces.jl

@@ -44,23 +44,30 @@ end
 
 function Gridap.FESpaces.TrialFESpace!(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64)
   @inbounds for (i, space) in enumerate(space.spaces)
-    TrialFESpace!(space, bc[i], Λ)
+    TrialFESpace!(space, bc.BoundaryCondition[i], Λ)
   end
 end
 
 function Gridap.FESpaces.TrialFESpace!(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64, ΔΛ::Float64)
   @inbounds for (i, space) in enumerate(space.spaces)
-    TrialFESpace!(space, bc[i], Λ, ΔΛ)
+    TrialFESpace!(space, bc.BoundaryCondition[i], Λ, ΔΛ)
   end
 end
 
+function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC)
+    TrialFESpace(space, bc, 0.0)
+end
 
-function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, ::NothingBC, Λ::Float64=0.0)
-  space
+function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC)
+    TrialFESpace(space, bc, 0.0)
 end
 
 
-function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64=0.0)
+function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, ::NothingBC, Λ::Float64)
+  space
+end
+
+function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64)
     trialspace= TrialFESpace(space, map(f -> f(Λ), bc.values))
    @inbounds for i in eachindex(bc.tags)
     if bc.caches[i] isa InterpolableBC
@@ -71,13 +78,13 @@ function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC
  return trialspace
 end
 
-
-function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64=0.0)
+function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC, Λ::Float64)
   U_ = Vector{Union{TrialFESpace,UnconstrainedFESpace}}(undef, length(space))
   @inbounds for (i, space) in enumerate(space.spaces)
-    U_[i] = TrialFESpace(space, bc[i], Λ)
+    U_[i] = TrialFESpace(space, bc.BoundaryCondition[i], Λ)
   end
   return MultiFieldFESpace(U_)
+
 end