Skip to content
Snippets Groups Projects
Commit 7f25bc50 authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Remove deprecated constructor and setProblem methods. The number of levels is...

Remove deprecated constructor and setProblem methods. The number of levels is now set through the number of transferoperators.
parent 79f9fe9a
No related branches found
No related tags found
No related merge requests found
...@@ -22,19 +22,6 @@ public: ...@@ -22,19 +22,6 @@ public:
MonotoneMGStep() {} 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, MonotoneMGStep(const MatrixType& mat,
VectorType& x, VectorType& x,
VectorType& rhs) VectorType& rhs)
...@@ -45,16 +32,6 @@ public: ...@@ -45,16 +32,6 @@ public:
virtual ~MonotoneMGStep() {} 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, virtual void setProblem(const MatrixType& mat,
VectorType& x, VectorType& x,
VectorType& rhs) VectorType& rhs)
......
...@@ -30,36 +30,6 @@ ...@@ -30,36 +30,6 @@
preprocessCalled(false) 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, MultigridStep(const MatrixType& mat,
VectorType& x, VectorType& x,
VectorType& rhs, VectorType& rhs,
...@@ -82,23 +52,6 @@ ...@@ -82,23 +52,6 @@
this->ignoreNodes_ = ignoreNodes; 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, MultigridStep(const MatrixType& mat,
VectorType& x, VectorType& x,
VectorType& rhs) : VectorType& rhs) :
...@@ -116,19 +69,6 @@ ...@@ -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, virtual void setProblem(const MatrixType& mat,
VectorType& x, VectorType& x,
const VectorType& rhs) const VectorType& rhs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment