Merge pull request #76 from MultiSimOLab/Allocs_DBC

Fixes allocations in Dirichlet boundary conditions

Author: jmartfrut

src/ComputationalModels/FESpaces.jl

@@ -8,29 +8,48 @@ function Gridap.FESpaces.TestFESpace(model, reffe, ::NothingBC; kwargs...)
 end
 
 function Gridap.FESpaces.TrialFESpace!(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64)
-  TrialFESpace!(space, map(f -> f(Λ), bc.values))
+  #   TrialFESpace!(space, map(f -> f(Λ), bc.values)) 
+  values = Vector{Any}(undef, length(bc.tags))
+  @inbounds for i in eachindex(bc.tags)
+    if bc.caches[i] isa Union{Vector,Float64}
+      values[i] = bc.values[i](Λ)(0.0)
+    else
+      values[i] = bc.values[i](Λ)
+    end
+  end
+  TrialFESpace!(space, values)
   ## actualizar DirichletCoupling
   @inbounds for i in eachindex(bc.tags)
     if bc.caches[i] isa InterpolableBC
       bc.caches[i](Λ)
       space.dirichlet_values[bc.caches[i].caches[2]] = bc.caches[i].caches[1]
     end
-   end
- return space
+  end
+  return space
 end
 
 
 function Gridap.FESpaces.TrialFESpace!(space::SingleFieldFESpace, bc::DirichletBC, Λ::Float64, ΔΛ::Float64)
-  TrialFESpace!(space, map(f -> ((x) -> f(Λ)(x) - f(Λ - ΔΛ)(x)), bc.values))
+  # TrialFESpace!(space, map(f -> ((x) -> f(Λ)(x) - f(Λ - ΔΛ)(x)), bc.values))
+  values = Vector{Any}(undef, length(bc.tags))
+  @inbounds for i in eachindex(bc.tags)
+    if bc.caches[i] isa Union{Vector,Float64}
+      values[i] = bc.values[i](Λ)(0.0) - bc.values[i](Λ - ΔΛ)(0.0)
+    else
+      values[i] = (x) -> bc.values[i](Λ)(x) - bc.values[i](Λ - ΔΛ)(x)
+    end
+  end
+  TrialFESpace!(space, values)
+
   @inbounds for i in eachindex(bc.tags)
     if bc.caches[i] isa InterpolableBC
       bc.caches[i](Λ - ΔΛ)
       v0 = copy(bc.caches[i].caches[1])
       bc.caches[i](Λ)
-      space.dirichlet_values[bc.caches[i].caches[2]] = bc.caches[i].caches[1]-v0
+      space.dirichlet_values[bc.caches[i].caches[2]] = bc.caches[i].caches[1] - v0
     end
-   end
- return space
+  end
+  return space
 end
 
 
@@ -61,17 +80,28 @@ end
 
 
 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)
+  #     trialspace= TrialFESpace(space, map(f -> f(Λ), bc.values))
+
+  values = Vector{Any}(undef, length(bc.tags))
+
+  @inbounds for i in eachindex(bc.tags)
+    if bc.caches[i] isa Union{Vector,Float64}
+      values[i] = bc.values[i](Λ)(0.0)
+    else
+      values[i] = bc.values[i](Λ)
+    end
+  end
+
+  trialspace = TrialFESpace(space, values)
+  @inbounds for i in eachindex(bc.tags)
     if bc.caches[i] isa InterpolableBC
       bc.caches[i](Λ)
       trialspace.dirichlet_values[bc.caches[i].caches[2]] = bc.caches[i].caches[1]
     end
-   end
- return trialspace
+  end
+  return trialspace
 end
 
-
 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)