Delegating new signature of CellBasis(trian,...)

gridap · Sep 3, 2019 · 62cb2c3 · 62cb2c3
1 parent 0130040
commit 62cb2c3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/FESpaces/FEBases.jl b/src/FESpaces/FEBases.jl
@@ -64,7 +64,7 @@ function CellBasis(
   trian::Triangulation{D,Z},
   fun::Function,
   b::FEBasis,
-  u::Vararg{<:CellField{Z}}) where {D,Z}
+  u...) where {D,Z}
   basis = CellBasis(trian,fun,b.cellbasis,u...)
   FEBasis(basis,trian)
 end

diff --git a/src/MultiField/MultiFEBases.jl b/src/MultiField/MultiFEBases.jl
@@ -27,7 +27,7 @@ function CellBasis(
   trian::Triangulation{D,Z},
   fun::Function,
   b::FEBasisWithFieldId,
-  u::Vararg{<:CellField{Z}}) where {D,Z}
+  u...) where {D,Z}
 
   febasis = CellBasis(trian,fun,b.febasis,u...)
   FEBasisWithFieldId(febasis,b.fieldid)

diff --git a/test/FESpacesTests/FEBasesTests.jl b/test/FESpacesTests/FEBasesTests.jl
@@ -28,9 +28,10 @@ uh = interpolate(fespace,ufun)
 trian = Triangulation(model)
 quad = CellQuadrature(trian,order=2)
 
-σfun(x,u) = x[1] + u
-σ(u) = CellBasis(trian,σfun,u)
-cm = inner(bh,σ(bh))
+σfun(x,u,i) = x[1] + u
+σ(u,i) = CellBasis(trian,σfun,u,i)
+ids = ones(Int,ncells(trian))
+cm = inner(bh,σ(bh,ids))
 m = integrate(cm,trian,quad)
 _ = collect(m)
 

diff --git a/test/FESpacesTests/VectorValuedFEOperatorsTests.jl b/test/FESpacesTests/VectorValuedFEOperatorsTests.jl
@@ -81,7 +81,7 @@ const λ = (E*ν)/((1+ν)*(1-2*ν))
 const μ = E/(2*(1+ν))
 
 # Constitutive law
-@law σ(x,ε) = λ*tr(ε)*one(ε) + 2*μ*ε
+@law σ(x,ε,id) = λ*tr(ε)*one(ε) + 2*μ*ε
 
 # Define manufactured functions
 ufun(x) = VectorValue(x[1] + x[2],x[1])
@@ -108,7 +108,8 @@ quad = CellQuadrature(trian,order=2)
 
 # Terms in the volume
 bfield = CellField(trian,bfun)
-a_elast(v,u) = inner( ε(v), σ(ε(u)) )
+ids = ones(Int,ncells(trian))
+a_elast(v,u) = inner( ε(v), σ(ε(u),ids) )
 b(v) = inner(v,bfield)
 t_Ω = AffineFETerm(a_elast,b,trian,quad)
 

diff --git a/test/MultiFieldTests/MultiFEBasesTests.jl b/test/MultiFieldTests/MultiFEBasesTests.jl
@@ -96,4 +96,9 @@ bh = FEBasis(V)
 @test isa(div(bh[1]),FEBasisWithFieldId)
 @test isa(curl(bh[1]),FEBasisWithFieldId)
 
+σfun(x,u,i) = i*u
+ids = ones(Int,ncells(trian))
+cb = CellBasis(trian,σfun,bh[1],ids)
+@test isa(cb,FEBasisWithFieldId)
+
 end # module MultiFEBasesTests