Merge branch 'feature/reenable-subgridl2assemblertest' into 'master'

[test]Reenable test of SubgridL2FunctionalAssembler

See merge request agnumpde/dune-fufem!140

dune/fufem/test/subgridxyfunctionalassemblertest.cc

@@ -226,8 +226,10 @@ struct SubgridL2FunctionalAssemblerTestSuite
         FunctionalAssembler<Basis> assembler(basis);
         FunctionalAssembler<HostBasis> hostassembler(hostbasis);
 
-        SubgridL2FunctionalAssembler<GridType, typename Basis::LocalFiniteElement, Dune::FieldVector<double,block_size> > subgridl2functionalassembler(function,grid);
-        L2FunctionalAssembler<HostGridType, typename HostBasis::LocalFiniteElement, Dune::FieldVector<double,block_size> > l2functionalassembler(function);
+        auto quadKey = QuadratureRuleKey(HostGridType::dimension,2);
+
+        SubgridL2FunctionalAssembler<GridType, typename Basis::LocalFiniteElement, Dune::FieldVector<double,block_size> > subgridl2functionalassembler(function,grid, quadKey);
+        L2FunctionalAssembler<HostGridType, typename HostBasis::LocalFiniteElement, Dune::FieldVector<double,block_size> > l2functionalassembler(function, quadKey);
 
         /* assemble l2 functionals */
         assembler.assemble(subgridl2functionalassembler, g);
@@ -332,15 +334,16 @@ struct SubgridH1FunctionalAssemblerTestSuite
                                                                  gsubcoeffs(basis.size()),
                                                                  ghost(hostbasis.size());
 
-        g = gsubcoeffs = 0.0;
+        g = 0.0;
+        gsubcoeffs = 0.0;
         ghost = 0.0;
 
         /* create assemblers */
         FunctionalAssembler<Basis> assembler(basis);
         FunctionalAssembler<HostBasis> hostassembler(hostbasis);
 
-        SubgridH1FunctionalAssembler<GridType, typename Basis::LocalFiniteElement, Dune::FieldVector<double,block_size> > subgridh1functionalassembler(function,grid);
-        H1FunctionalAssembler<HostGridType, typename HostBasis::LocalFiniteElement, Dune::FieldVector<double,block_size> > h1functionalassembler(function);
+        SubgridH1FunctionalAssembler<GridType, typename Basis::LocalFiniteElement, Dune::FieldVector<double,block_size> > subgridh1functionalassembler(function,grid,4);
+        H1FunctionalAssembler<HostGridType, typename HostBasis::LocalFiniteElement, Dune::FieldVector<double,block_size> > h1functionalassembler(function,4);
 
         /* assemble h1 functionals */
         assembler.assemble(subgridh1functionalassembler, g);
@@ -372,28 +375,28 @@ int main(int argc, char** argv)
 
     std::cout << "This is the SubgridXYFunctionalAssemblerTest" << std::endl;
 
-//    SubgridL2FunctionalAssemblerTestSuite l2tests;
+    SubgridL2FunctionalAssemblerTestSuite l2tests;
     SubgridH1FunctionalAssemblerTestSuite h1tests;
 
     bool passed = true;
 
     std::cout << "Testing SubgridL2FunctionalAssembler" << std::endl;
 #if HAVE_DUNE_UGGRID
-//    passed = passed and checkWithAdaptiveGrid<Dune::UGGrid<2> >(l2tests, 3, 3);
-//    passed = passed and checkWithAdaptiveGrid<Dune::UGGrid<3> >(l2tests, 1, 2);
+    passed &= checkWithAdaptiveGrid<Dune::UGGrid<2> >(l2tests, 3, 3);
+    passed &= checkWithAdaptiveGrid<Dune::UGGrid<3> >(l2tests, 1, 2);
 #endif
 #if HAVE_DUNE_ALUGRID
-//    passed = passed and checkWithAdaptiveGrid<Dune::ALUGrid<2,2, Dune::simplex, Dune::nonconforming> >(l2tests, 3, 3);
-//    passed = passed and checkWithAdaptiveGrid<Dune::ALUGrid<3,3, Dune::simplex, Dune::nonconforming> >(l2tests, 1, 2);
+    passed &= checkWithAdaptiveGrid<Dune::ALUGrid<2,2, Dune::simplex, Dune::nonconforming> >(l2tests, 3, 3);
+//    passed &= checkWithAdaptiveGrid<Dune::ALUGrid<3,3, Dune::simplex, Dune::nonconforming> >(l2tests, 1, 2);
 #endif
     std::cout << "Testing SubgridH1FunctionalAssembler" << std::endl;
 #if HAVE_DUNE_UGGRID
-    passed = passed and checkWithAdaptiveGrid<Dune::UGGrid<2> >(h1tests, 3, 3);
-    passed = passed and checkWithAdaptiveGrid<Dune::UGGrid<3> >(h1tests, 1, 2);
+    passed &= checkWithAdaptiveGrid<Dune::UGGrid<2> >(h1tests, 3, 3);
+    passed &= checkWithAdaptiveGrid<Dune::UGGrid<3> >(h1tests, 1, 2);
 #endif
 #if HAVE_DUNE_ALUGRID
-    passed = passed and checkWithAdaptiveGrid<Dune::ALUGrid<2,2, Dune::simplex, Dune::nonconforming> >(h1tests, 3, 3);
-//    passed = passed and checkWithAdaptiveGrid<Dune::ALUGrid<3,3, Dune::simplex, Dune::nonconforming> >(h1tests, 1, 2);
+    passed &= checkWithAdaptiveGrid<Dune::ALUGrid<2,2, Dune::simplex, Dune::nonconforming> >(h1tests, 3, 3);
+//    passed &= checkWithAdaptiveGrid<Dune::ALUGrid<3,3, Dune::simplex, Dune::nonconforming> >(h1tests, 1, 2);
 #endif
 
     return passed ? 0 : 1;