dune/solvers/iterationsteps/mmgstep.cc

@@ -66,8 +66,8 @@ preprocess()
 
         typedef ProjectedBlockGSStep<MatrixType, VectorType> SmootherType;
 
-        dynamic_cast<SmootherType*>(&loopBaseSolver->getIterationStep())->hasObstacle_ = hasObstacleHierarchy_[0].get();
-        dynamic_cast<SmootherType*>(&loopBaseSolver->getIterationStep())->obstacles_   = obstacleHierarchy_[0].get();
+        std::dynamic_pointer_cast<SmootherType>(loopBaseSolver->getIterationStep())->hasObstacle_ = hasObstacleHierarchy_[0].get();
+        std::dynamic_pointer_cast<SmootherType>(loopBaseSolver->getIterationStep())->obstacles_   = obstacleHierarchy_[0].get();
 
 #if HAVE_IPOPT
     } else if (typeid(*this->basesolver_) == typeid(QuadraticIPOptSolver<MatrixType,VectorType>)) {

dune/solvers/iterationsteps/multigridstep.cc

@@ -162,7 +162,7 @@ void MultigridStep<MatrixType, VectorType, BitVectorType>::preprocess()
         typedef ::LoopSolver<VectorType> DuneSolversLoopSolver;
 
         if (auto loopBaseSolver = std::dynamic_pointer_cast<DuneSolversLoopSolver>(this->basesolver_)) {
-            auto iterationStep = dynamic_cast<SmootherType*>(&loopBaseSolver->getIterationStep());
+            auto iterationStep = std::dynamic_pointer_cast<SmootherType>(loopBaseSolver->getIterationStep());
             assert(iterationStep);
             iterationStep->setProblem(*(this->matrixHierarchy_[0]), *this->xHierarchy_[0], this->rhsHierarchy_[0]);
             iterationStep->setIgnore(*ignoreNodesHierarchy_[0]);

dune/solvers/solvers/iterativesolver.hh

@@ -88,15 +88,15 @@ namespace Dune {
         }
 
         /** \brief Get iteration step */
-        const ItStep& getIterationStep() const
+        const std::shared_ptr<ItStep> getIterationStep() const
         {
-          return *iterationStep_;
+          return iterationStep_;
         }
 
         /** \brief Get iteration step */
-        ItStep& getIterationStep()
+        std::shared_ptr<ItStep> getIterationStep()
         {
-          return *iterationStep_;
+          return iterationStep_;
         }
 
         /** \brief Set the error norm */