From d85300713328f23a2ac8d64d784a20a71287bee2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 23 Jan 2015 18:56:26 -0600 Subject: [PATCH] Remove deprecated constructor of SolverSelector. --- doc/news/changes.h | 1 + include/deal.II/lac/solver_selector.h | 19 ------------------- tests/lac/solver_selector_02.cc | 6 ------ tests/lac/solver_selector_02.output | 3 --- 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/doc/news/changes.h b/doc/news/changes.h index 9db97cc55d..50da9e86b7 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -159,6 +159,7 @@ inconvenience this causes. - The deprecated variants of DoFTools::make_periodicity_constraints. - BlockMatrixArray and BlockTrianglePreconditioner functions that take an explicit VectorMemory object. + - The SolverSelector constructor that takes a VectorMemory argument.
This release also removes the deprecated class MGDoFHandler. The functionality of this class had previously been incorporated into diff --git a/include/deal.II/lac/solver_selector.h b/include/deal.II/lac/solver_selector.h index 5ade2f7cab..eea1d41927 100644 --- a/include/deal.II/lac/solver_selector.h +++ b/include/deal.II/lac/solver_selector.h @@ -104,16 +104,6 @@ public: */ SolverSelector (); - /** - * @deprecated Use the default constructor, set_control() and select(). - * - * Constructor. Use the arguments to initialize actual solver objects. The - * VectorMemory argument is ignored. - */ - SolverSelector (const std::string &solvername, - SolverControl &control, - VectorMemory &vector_memory) DEAL_II_DEPRECATED; - /** * Destructor */ @@ -244,15 +234,6 @@ SolverSelector::SolverSelector() {} -template -SolverSelector::SolverSelector(const std::string &solver_name, - SolverControl &control, - VectorMemory &) : - control(&control), - solver_name(solver_name) -{} - - template SolverSelector::~SolverSelector() {} diff --git a/tests/lac/solver_selector_02.cc b/tests/lac/solver_selector_02.cc index 9e9af94a29..625dc8700b 100644 --- a/tests/lac/solver_selector_02.cc +++ b/tests/lac/solver_selector_02.cc @@ -68,12 +68,6 @@ check(const MATRIX &A, const VECTOR &f) u = 0.; solver.solve(A, u, f, pre); } - - //test deprecated constructor too: - GrowingVectorMemory mem; - SolverSelector solver2("gmres", mycont, mem); - u = 0.; - solver2.solve(A, u, f, pre); } diff --git a/tests/lac/solver_selector_02.output b/tests/lac/solver_selector_02.output index f4e7328cc5..22d9b852d0 100644 --- a/tests/lac/solver_selector_02.output +++ b/tests/lac/solver_selector_02.output @@ -12,6 +12,3 @@ DEAL:GMRES::Convergence step 0 value 0 DEAL:FGMRES::MySolverControl 0 DEAL:FGMRES::Starting value 0 DEAL:FGMRES::Convergence step 0 value 0 -DEAL:GMRES::MySolverControl 0 -DEAL:GMRES::Starting value 0 -DEAL:GMRES::Convergence step 0 value 0 -- 2.39.5