Remove SolverCG::res2.

This variable was only used inside the SolverCG::criterion() function that was
supposed to let derived classes overload when the solver terminates. But the
criterion() function was never called anywhere, so there is no point in
keeping it. Furthermore, the res2 variable it returns was never set. So
remove the whole shebang.

diff --git a/include/deal.II/lac/solver_cg.h b/include/deal.II/lac/solver_cg.h
index 2cfaeb07a8f799b5c2c0227b85a0d8bb7013c979..3f552cafaa96eeabdebb9e4ac82f33522bb0fe46 100644 (file)
--- a/include/deal.II/lac/solver_cg.h
+++ b/include/deal.II/lac/solver_cg.h
@@ -214,12 +214,6 @@ public:
     const bool every_iteration=false);
 
 protected:
-  /**
-   * Implementation of the computation of the norm of the residual. This can
-   * be replaced by a more problem oriented functional in a derived class.
-   */
-  virtual double criterion();
-
   /**
    * Interface for derived class. This function gets the current iteration
    * vector, the residual and the update vector in each step. It can be used
@@ -254,14 +248,6 @@ protected:
   VectorType *Vp;
   VectorType *Vz;
 
-  /**
-   * Within the iteration loop, the square of the residual vector is stored in
-   * this variable. The function @p criterion uses this variable to compute
-   * the convergence value, which in this class is the norm of the residual
-   * vector and thus the square root of the @p res2 value.
-   */
-  double res2;
-
   /**
    * Additional parameters.
    */
@@ -362,15 +348,6 @@ SolverCG<VectorType>::~SolverCG ()
 
 
 
-template <typename VectorType>
-double
-SolverCG<VectorType>::criterion()
-{
-  return std::sqrt(res2);
-}
-
-
-
 template <typename VectorType>
 void
 SolverCG<VectorType>::cleanup()