From 37bfe0a818cc2db28764cacd5b2d2a9e44512bad Mon Sep 17 00:00:00 2001
From: Mathis Kelm <mathis.kelm@iws.uni-stuttgart.de>
Date: Wed, 13 Dec 2023 14:28:34 +0100
Subject: [PATCH] [linear] remove deprecated helper functions
---
dumux/linear/seqsolverbackend.hh | 89 --------------------------------
1 file changed, 89 deletions(-)
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 103961b4b7..17a120a717 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -52,95 +52,6 @@ class IterativePreconditionedSolverImpl
{
public:
- template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
- [[deprecated("Removed after 3.8. Use solver from istlsolvers.hh")]]
- static bool solve(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
- const std::string& modelParamGroup = "")
- {
- Preconditioner precond(A, s.precondIter(), s.relaxation());
-
- // make a linear operator from a matrix
- using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
- MatrixAdapter linearOperator(A);
-
- Solver solver(linearOperator, precond, s.residReduction(), s.maxIter(), s.verbosity());
-
- Vector bTmp(b);
-
- Dune::InverseOperatorResult result;
- solver.apply(x, bTmp, result);
-
- return result.converged;
- }
-
- template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
- [[deprecated("Removed after 3.8. Use solver from istlsolvers.hh")]]
- static bool solveWithGMRes(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
- const std::string& modelParamGroup = "")
- {
- // get the restart threshold
- const int restartGMRes = getParamFromGroup<int>(modelParamGroup, "LinearSolver.GMResRestart", 10);
-
- Preconditioner precond(A, s.precondIter(), s.relaxation());
-
- // make a linear operator from a matrix
- using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
- MatrixAdapter linearOperator(A);
-
- Solver solver(linearOperator, precond, s.residReduction(), restartGMRes, s.maxIter(), s.verbosity());
-
- Vector bTmp(b);
-
- Dune::InverseOperatorResult result;
- solver.apply(x, bTmp, result);
-
- return result.converged;
- }
-
- template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
- [[deprecated("Removed after 3.8. Use solver from istlsolvers.hh")]]
- static bool solveWithILU0Prec(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
- const std::string& modelParamGroup = "")
- {
- Preconditioner precond(A, s.relaxation());
-
- using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
- MatrixAdapter operatorA(A);
-
- Solver solver(operatorA, precond, s.residReduction(), s.maxIter(), s.verbosity());
-
- Vector bTmp(b);
-
- Dune::InverseOperatorResult result;
- solver.apply(x, bTmp, result);
-
- return result.converged;
- }
-
- // solve with RestartedGMRes (needs restartGMRes as additional argument)
- template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
- [[deprecated("Removed after 3.8. Use solver from istlsolvers.hh")]]
- static bool solveWithILU0PrecGMRes(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
- const std::string& modelParamGroup = "")
- {
- // get the restart threshold
- const int restartGMRes = getParamFromGroup<int>(modelParamGroup, "LinearSolver.GMResRestart", 10);
-
- Preconditioner precond(A, s.relaxation());
-
- using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
- MatrixAdapter operatorA(A);
-
- Solver solver(operatorA, precond, s.residReduction(), restartGMRes, s.maxIter(), s.verbosity());
-
- Vector bTmp(b);
-
- Dune::InverseOperatorResult result;
- solver.apply(x, bTmp, result);
-
- return result.converged;
- }
-
// solve with generic parameter tree
template<class Preconditioner, class Solver, class Matrix, class Vector>
static bool solveWithParamTree(const Matrix& A, Vector& x, const Vector& b,
--
GitLab