Remove deprecated constructor of SolverSelector.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 9db97cc55d4b883aad147865ec8021fc684e86db..50da9e86b70c1d27c985ae2f033d5e19ee39ab76 100644 (file)
--- 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.
   <br>
   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 5ade2f7cab416a31ba805669299f961d97226659..eea1d419276f7b1fddf28ebc67918f254c0587ed 100644 (file)
--- 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> &vector_memory) DEAL_II_DEPRECATED;
-
   /**
    * Destructor
    */
@@ -244,15 +234,6 @@ SolverSelector<VECTOR>::SolverSelector()
 {}
 
 
-template <class VECTOR>
-SolverSelector<VECTOR>::SolverSelector(const std::string    &solver_name,
-                                       SolverControl        &control,
-                                       VectorMemory<VECTOR> &) :
-  control(&control),
-  solver_name(solver_name)
-{}
-
-
 template <class VECTOR>
 SolverSelector<VECTOR>::~SolverSelector()
 {}

diff --git a/tests/lac/solver_selector_02.cc b/tests/lac/solver_selector_02.cc
index 9e9af94a29846907d4210aa27bff1929201e7ced..625dc8700b60b0dc622a747ce838a385dc4477fc 100644 (file)
--- 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<VECTOR> mem;
-  SolverSelector<VECTOR> 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 f4e7328cc5eaabc0f76b6e0d0db9beb518b2579b..22d9b852d030c49057cd2a103f28ebc063f14708 100644 (file)
--- 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