Merge pull request #104 from gridap/fixing_misc_issues

Fixing misc issues
gridap · Sep 19, 2019 · 98e33b0 · 98e33b0
2 parents a90fb1e + 64681cf
commit 98e33b0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/src/FESpaces/FEBases.jl b/src/FESpaces/FEBases.jl
@@ -86,10 +86,15 @@ function CellBasis(
   fun::Function,
   b::FEBasis,
   u...) where {D,Z}
-  basis = CellBasis(trian,fun,b.cellbasis,u...)
+  _u = [_prepare_cellbasis(ui) for ui in u]
+  basis = CellBasis(trian,fun,b.cellbasis,_u...)
   FEBasis(basis,trian)
 end
 
+_prepare_cellbasis(ui) = ui
+
+_prepare_cellbasis(ui::FEBasis) = ui.cellbasis
+
 function restrict(feb::FEBasis,trian::BoundaryTriangulation)
   cb = restrict(feb.cellbasis,trian)
   FEBasis(cb,trian)

diff --git a/src/MultiField/MultiFEBases.jl b/src/MultiField/MultiFEBases.jl
@@ -32,10 +32,16 @@ function CellBasis(
   b::FEBasisWithFieldId,
   u...) where {D,Z}
 
-  febasis = CellBasis(trian,fun,b.febasis,u...)
+  _u = [_prepare_febasis(ui) for ui in u]
+
+  febasis = CellBasis(trian,fun,b.febasis,_u...)
   FEBasisWithFieldId(febasis,b.fieldid)
 end
 
+_prepare_febasis(ui) = ui
+
+_prepare_febasis(ui::FEBasisWithFieldId) = ui.febasis
+
 for op in (:+,:-,:(gradient),:(symmetric_gradient),:(div),:(trace),:(curl))
   @eval begin
     function ($op)(a::FEBasisWithFieldId)

diff --git a/src/MultiField/MultiFEOperators.jl b/src/MultiField/MultiFEOperators.jl
@@ -52,4 +52,16 @@ function NonLinearFEOperator(
   NonLinearFEOperator(V,U,assem,terms...)
 end
 
+function NonLinearFEOperator(
+  testfesp::Vector{<:FESpaceWithDirichletData},
+  trialfesp::Vector{<:FESpaceWithDirichletData},
+  terms::Vararg{<:FETerm})
+
+  assem = SparseMatrixAssembler(testfesp,trialfesp)
+
+  V = MultiFESpace(testfesp)
+  U = MultiFESpace(trialfesp)
+  NonLinearFEOperator(V,U,assem,terms...)
+end
+
 end # module MultiFEOperators
diff --git a/test/MultiFieldTests/MultiNonLinearFEOperatorsTests.jl b/test/MultiFieldTests/MultiNonLinearFEOperatorsTests.jl
@@ -92,4 +92,12 @@ e2h1 = sqrt(sum( integrate(h1(e2),trian,quad) ))
 @test e2l2 < 1.e-8
 @test e2h1 < 1.e-8
 
+# Further tests
+
+t_Ω = NonLinearFETerm(res,jac,trian,quad)
+op = NonLinearFEOperator(V,U,t_Ω)
+
+uh = solve(solver,op)
+
+
 end