Merge branch 'master' into feature/blockgsstep-default-constructible

dune/solvers/iterationsteps/blockgssteps.hh

@@ -352,7 +352,8 @@ auto gs(Args&&... args) {
  * \brief A Gauss--Seidel-type linear iteration step.
  * \param localSolver The solver for the linear block correction problems.
  */
-template <class Matrix, class Vector, class BitVector, class LocalSolver>
+template <class LocalSolver, class Matrix, class Vector,
+          class BitVector = Dune::Solvers::DefaultBitVector_t<Vector>>
 struct BlockGSStep : public LinearIterationStep<Matrix, Vector, BitVector> {
 
   //! \brief Implicitly default-construct local solver
@@ -415,7 +416,7 @@ struct BlockGSStepFactory {
   static auto create(
       LocalSolver&& localSolver,
       BlockGS::Direction direction = BlockGS::Direction::FORWARD) {
-    return BlockGSStep<Matrix, Vector, BitVector, LocalSolver>(
+    return BlockGSStep<LocalSolver, Matrix, Vector, BitVector>(
         std::forward<LocalSolver>(localSolver), direction);
   }
 
@@ -424,7 +425,7 @@ struct BlockGSStepFactory {
       LocalSolver&& localSolver,
       BlockGS::Direction direction = BlockGS::Direction::FORWARD) {
     return std::make_shared<
-        BlockGSStep<Matrix, Vector, BitVector, LocalSolver>>(
+        BlockGSStep<LocalSolver, Matrix, Vector, BitVector>>(
         std::forward<LocalSolver>(localSolver), direction);
   }
 

dune/solvers/iterationsteps/obstacletnnmgstep.hh

@@ -73,8 +73,7 @@ class ObstacleTNNMGStep
 
         typedef ProjectedBlockGSStep<Matrix, Vector> NonlinearSmoother;
         typedef Dune::Solvers::BlockGSStep<
-            Matrix, Vector, Dune::Solvers::DefaultBitVector_t<Vector>,
-            decltype(Dune::Solvers::BlockGS::LocalSolvers::gs())>
+        decltype(Dune::Solvers::BlockGS::LocalSolvers::gs()), Matrix, Vector>
             LinearSmoother;
         typedef MultigridStep<Matrix, Vector, BitVector> LinearMultigridStep;
         typedef EnergyNorm<Matrix, Vector> LinearBaseSolverEnergyNorm;