From b1bf5172955b940f6b3c9d027bd4a839c6486199 Mon Sep 17 00:00:00 2001 From: Francesc Verdugo Date: Thu, 29 Aug 2019 19:06:17 +0200 Subject: [PATCH] Assembler is not optional in FEOperators --- src/FESpaces/FEOperators.jl | 4 ++-- test/FESpacesTests/VectorValuedNonLinearFEOperatorsTests.jl | 5 +++++ test/MultiFieldTests/MultiFEOperatorsTests.jl | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/FESpaces/FEOperators.jl b/src/FESpaces/FEOperators.jl index e891b2882..351fbf8a8 100644 --- a/src/FESpaces/FEOperators.jl +++ b/src/FESpaces/FEOperators.jl @@ -262,7 +262,7 @@ struct NonLinearFEOperator <:FEOperator testfesp::FESpaceLike trialfesp::FESpaceLike assem::AssemblerLike - terms::Tuple{<:FETerm} + terms::NTuple{N,<:FETerm} where N end function NonLinearFEOperator( @@ -278,7 +278,7 @@ function NonLinearFEOperator( trialfesp::FESpaceLike, terms::Vararg{<:FETerm}) assem = SparseMatrixAssembler(testfesp,trialfesp) - NonLinearFEOperator(testfesp,trialfesp,assem,terms...) + NonLinearFEOperator(testfesp,trialfesp,assem,terms) end function NonLinearFEOperator( diff --git a/test/FESpacesTests/VectorValuedNonLinearFEOperatorsTests.jl b/test/FESpacesTests/VectorValuedNonLinearFEOperatorsTests.jl index 6482a18ab..fd305e5e1 100644 --- a/test/FESpacesTests/VectorValuedNonLinearFEOperatorsTests.jl +++ b/test/FESpacesTests/VectorValuedNonLinearFEOperatorsTests.jl @@ -82,4 +82,9 @@ eh1 = sqrt(sum( integrate(h1(e),trian,quad) )) @test el2 < 1.e-8 @test eh1 < 1.e-8 + +# Further tests +op = NonLinearFEOperator(V,U,t_Ω) +op = NonLinearFEOperator(V,U,t_Ω,t_Ω) + end # module diff --git a/test/MultiFieldTests/MultiFEOperatorsTests.jl b/test/MultiFieldTests/MultiFEOperatorsTests.jl index eb29121de..a0bae3c60 100644 --- a/test/MultiFieldTests/MultiFEOperatorsTests.jl +++ b/test/MultiFieldTests/MultiFEOperatorsTests.jl @@ -101,5 +101,6 @@ e2h1 = sqrt(sum( integrate(h1(e2),trian,quad) )) op = LinearFEOperator(a,b,V,U,assem,trian,quad) op = LinearFEOperator(V,U,t_Ω,t_Γ) +op = LinearFEOperator(V,U,t_Ω) end