diff --git a/dune/solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh index 1acdc5c4c0fe1ffb825b332a16de8ffb14907103..c9d70ade7ea37b48606142957b3c67785a264858 100644 --- a/dune/solvers/iterationsteps/mmgstep.hh +++ b/dune/solvers/iterationsteps/mmgstep.hh @@ -22,19 +22,6 @@ public: MonotoneMGStep() {} - MonotoneMGStep(int numLevels) - DUNE_DEPRECATED_MSG("The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators. Just erase the number of levels from the argument list in your constructor call.") - {} - - MonotoneMGStep(const MatrixType& mat, - VectorType& x, - VectorType& rhs, int numLevels) - DUNE_DEPRECATED_MSG("The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators. Just erase the number of levels from the argument list in your constructor call.") - : MultigridStep<MatrixType, VectorType>(mat, x, rhs, numLevels) - { - oldCritical.resize(x.size(), false); - } - MonotoneMGStep(const MatrixType& mat, VectorType& x, VectorType& rhs) @@ -45,16 +32,6 @@ public: virtual ~MonotoneMGStep() {} - virtual void setProblem(const MatrixType& mat, - VectorType& x, - VectorType& rhs, - int numLevels) - DUNE_DEPRECATED_MSG("Use setProblem(const MatrixType& mat,VectorType& x,const VectorType& rhs). The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators.") - { - MultigridStep<MatrixType, VectorType>::setProblem(mat,x,rhs); - oldCritical.resize(x.size(), false); - } - virtual void setProblem(const MatrixType& mat, VectorType& x, VectorType& rhs) diff --git a/dune/solvers/iterationsteps/multigridstep.hh b/dune/solvers/iterationsteps/multigridstep.hh index 3781d168cf09919fc371d76c5f70208dc15de70f..524d8a7e70daa3a4e977d00af6200b9bf6e2dd70 100644 --- a/dune/solvers/iterationsteps/multigridstep.hh +++ b/dune/solvers/iterationsteps/multigridstep.hh @@ -30,36 +30,6 @@ preprocessCalled(false) {} - MultigridStep(const MatrixType& mat, - VectorType& x, - VectorType& rhs, int numLevels, - int mu, int nu1, int nu2, - LinearIterationStep<MatrixType, VectorType>* preSmoother, - LinearIterationStep<MatrixType, VectorType>* postSmoother, - Solver* baseSolver, - const BitVectorType* ignoreNodes) - DUNE_DEPRECATED_MSG("The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators. Just erase the number of levels from the argument list in your constructor call.") : - LinearIterationStep<MatrixType, VectorType>(mat, x, rhs), - presmoother_(numLevels), postsmoother_(numLevels), - matrixHierarchy_(numLevels), - ignoreNodesHierarchy_(numLevels), - xHierarchy_(numLevels), - rhsHierarchy_(numLevels), - preprocessCalled(false) - { - level_ = numLevels-1; - - mu_ = mu; - nu1_ = nu1; - nu2_ = nu2; - - setSmoother(preSmoother,postSmoother); - - basesolver_ = baseSolver; - - this->ignoreNodes_ = ignoreNodes; - } - MultigridStep(const MatrixType& mat, VectorType& x, VectorType& rhs, @@ -82,23 +52,6 @@ this->ignoreNodes_ = ignoreNodes; } - - MultigridStep(const MatrixType& mat, - VectorType& x, - VectorType& rhs, int numLevels) - DUNE_DEPRECATED_MSG("The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators. Just erase the number of levels from the argument list in your constructor call.") : - LinearIterationStep<MatrixType, VectorType>(mat, x, rhs), - presmoother_(numLevels),postsmoother_(numLevels), - basesolver_(0), - matrixHierarchy_(numLevels), - ignoreNodesHierarchy_(numLevels), - xHierarchy_(numLevels), - rhsHierarchy_(numLevels), - preprocessCalled(false) - { - level_ = numLevels-1; - } - MultigridStep(const MatrixType& mat, VectorType& x, VectorType& rhs) : @@ -116,19 +69,6 @@ } } - virtual void setProblem(const MatrixType& mat, - VectorType& x, - VectorType& rhs, - int numLevels DUNE_UNUSED) - DUNE_DEPRECATED_MSG("Use setProblem(const MatrixType& mat,VectorType& x,const VectorType& rhs). The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators.") - { - setProblem(mat, x, rhs); - } - - virtual void setNumberOfLevels(int numLevels DUNE_UNUSED) - DUNE_DEPRECATED_MSG("The number of levels is no longer set explicitely, but instead inferred from the number of transfer operators. The functionality of this function is now performed in preprocess().") - {} - virtual void setProblem(const MatrixType& mat, VectorType& x, const VectorType& rhs)