From 7f25bc50e7e5cb710a124a6f56a38c73418dceb2 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Fri, 27 Jun 2014 10:39:43 +0200
Subject: [PATCH] Remove deprecated constructor and setProblem methods. The
number of levels is now set through the number of transferoperators.
---
dune/solvers/iterationsteps/mmgstep.hh | 23 --------
dune/solvers/iterationsteps/multigridstep.hh | 60 --------------------
2 files changed, 83 deletions(-)
diff --git a/dune/solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh
index 1acdc5c4..c9d70ade 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 3781d168..524d8a7e 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)
--
GitLab