[test] eocstudy allow setting solver options in ctor

dune/gdt/discretizations/interfaces.hh

@@ -147,6 +147,7 @@ template <class Traits>
 class ContainerBasedStationaryDiscretizationInterface : public StationaryDiscretizationInterface<Traits>
 {
   typedef StationaryDiscretizationInterface<Traits> BaseType;
+  typedef ContainerBasedStationaryDiscretizationInterface<Traits> ThisType;
 
 public:
   typedef typename Traits::MatrixType MatrixType;
@@ -195,12 +196,12 @@ public:
   /// \name Provided by the interface for convenience.
   /// \{
 
-  std::vector<std::string> solver_types() const
+  static std::vector<std::string> solver_types()
   {
     return LinearSolverType::types();
   }
 
-  XT::Common::Configuration solver_options(const std::string type = "") const
+  static XT::Common::Configuration solver_options(const std::string type = ThisType::solver_types()[0])
   {
     return LinearSolverType::options(type);
   }

dune/gdt/test/linearelliptic/eocstudy.hh

@@ -48,8 +48,9 @@ public:
   LinearEllipticEocStudy(TestCaseType& test_case,
                          const std::vector<std::string> only_these_norms = {},
                          const std::string visualize_prefix = "",
-                         const size_t over_integrate = 2)
-    : BaseType(test_case, only_these_norms, visualize_prefix)
+                         const size_t over_integrate = 2,
+                         XT::Common::Configuration solver_options = DiscretizationType::solver_options())
+    : BaseType(test_case, only_these_norms, visualize_prefix, solver_options)
     , over_integrate_(over_integrate)
   {
   }

dune/gdt/test/linearelliptic/linearelliptic__cg_discretization.tpl

@@ -45,7 +45,8 @@ struct linearelliptic_CG_discretization : public ::testing::Test
                                           typename TestCaseType::ProblemType::RangeFieldType,
                                           1>
         Discretizer;
-    Dune::GDT::Test::LinearEllipticEocStudy<TestCaseType, Discretizer> eoc_study(test_case);
+    const auto solver_options = DXTC_CONFIG.sub("solver", false);
+    Dune::GDT::Test::LinearEllipticEocStudy<TestCaseType, Discretizer> eoc_study(test_case, {}, "", solver_options);
     try {
       Dune::XT::Test::check_eoc_study_for_success(eoc_study, eoc_study.run(DXTC_LOG_INFO));
     } catch (Dune::XT::Common::Exceptions::spe10_data_file_missing&) {

dune/gdt/test/stationary-eocstudy.hh

@@ -45,7 +45,8 @@ protected:
 public:
   StationaryEocStudy(TestCaseType& test_case,
                      const std::vector<std::string> only_these_norms = {},
-                     const std::string visualize_prefix = "")
+                     const std::string visualize_prefix = "",
+                     XT::Common::Configuration solver_options = DiscretizationType::solver_options())
     : BaseType(only_these_norms)
     , test_case_(test_case)
     , current_refinement_(0)
@@ -60,6 +61,7 @@ public:
     , current_solution_vector_(nullptr)
     , visualize_prefix_(visualize_prefix)
     , current_num_DoFs_(0)
+    , solver_options_(solver_options)
   {
   }
 
@@ -142,6 +144,7 @@ public:
     return grid_widths_[current_refinement_];
   } // ... current_grid_width(...)
 
+
   virtual double compute_on_current_refinement() override final
   {
     if (current_refinement_ != last_computed_refinement_) {
@@ -152,7 +155,8 @@ public:
           Discretizer::discretize(test_case_.level_provider(current_refinement_),
                                   test_case_.problem(),
                                   test_case_.level_of(current_refinement_)));
-      current_solution_vector_on_level_ = XT::Common::make_unique<VectorType>(current_discretization_->solve());
+      current_solution_vector_on_level_ =
+          XT::Common::make_unique<VectorType>(current_discretization_->solve(solver_options_));
       time_to_solution_ = timer.elapsed();
       const ConstDiscreteFunctionType current_refinement_solution(
           current_discretization_->ansatz_space(), *current_solution_vector_on_level_, "solution on current level");
@@ -224,7 +228,9 @@ protected:
     if (!reference_solution_computed_) {
       reference_discretization_ = XT::Common::make_unique<DiscretizationType>(
           Discretizer::discretize(test_case_.reference_provider(), test_case_.problem(), test_case_.reference_level()));
-      reference_solution_vector_ = XT::Common::make_unique<VectorType>(reference_discretization_->solve());
+      reference_solution_vector_ =
+          XT::Common::make_unique<VectorType>(reference_discretization_->solve(solver_options_));
+
       reference_solution_computed_ = true;
       // visualize
       if (!visualize_prefix_.empty()) {
@@ -264,6 +270,7 @@ protected:
   std::unique_ptr<VectorType> current_solution_vector_;
   const std::string visualize_prefix_;
   size_t current_num_DoFs_;
+  const XT::Common::Configuration solver_options_;
 }; // class StationaryEocStudy