From: Matthias Maier <tamiko@43-1.org>
Date: Thu, 6 Apr 2017 20:13:38 +0000 (-0500)
Subject: C++ cleanup: Remove deprecated class ScaledMatrix
X-Git-Tag: v9.0.0-rc1~1711^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5576367b69211277309affbf36a63d42e083ad33;p=dealii.git

C++ cleanup: Remove deprecated class ScaledMatrix
---

diff --git a/include/deal.II/lac/matrix_lib.h b/include/deal.II/lac/matrix_lib.h
index 6be070835a..8fed803703 100644
--- a/include/deal.II/lac/matrix_lib.h
+++ b/include/deal.II/lac/matrix_lib.h
@@ -32,76 +32,6 @@ template<typename number> class SparseMatrix;
  */
 
 
-/**
- * A matrix that is the multiple of another matrix.
- *
- * Matrix-vector products of this matrix are composed of those of the original
- * matrix with the vector and then scaling of the result by a constant factor.
- *
- * @deprecated If deal.II was configured with C++11 support, use the
- * LinearOperator class instead, see the module on
- * @ref LAOperators "linear operators"
- * for further details.
- *
- * @author Guido Kanschat, 2007
- */
-template<typename VectorType>
-class ScaledMatrix : public Subscriptor
-{
-public:
-  /**
-   * Constructor leaving an uninitialized object.
-   */
-  ScaledMatrix ();
-  /**
-   * Constructor with initialization.
-   */
-  template <typename MatrixType>
-  ScaledMatrix (const MatrixType &M,
-                const double factor);
-
-  /**
-   * Destructor
-   */
-  ~ScaledMatrix ();
-
-  /**
-   * Initialize for use with a new matrix and factor.
-   */
-  template <typename MatrixType>
-  void initialize (const MatrixType &M,
-                   const double factor);
-
-  /**
-   * Reset the object to its original state.
-   */
-  void clear ();
-
-  /**
-   * Matrix-vector product.
-   */
-  void vmult (VectorType &w,
-              const VectorType &v) const;
-
-  /**
-   * Transposed matrix-vector product.
-   */
-  void Tvmult (VectorType &w,
-               const VectorType &v) const;
-
-private:
-  /**
-   * The matrix.
-   */
-  PointerMatrixBase<VectorType> *m;
-
-  /**
-   * The scaling factor;
-   */
-  double factor;
-};
-
-
 /**
  * Mean value filter.  The vmult() functions of this matrix filter out mean
  * values of the vector.  If the vector is of type BlockVector, then an
@@ -199,81 +129,6 @@ private:
 //---------------------------------------------------------------------------
 
 
-template<typename VectorType>
-inline
-ScaledMatrix<VectorType>::ScaledMatrix()
-  :
-  m(0),
-  factor (0)
-{}
-
-
-
-template<typename VectorType>
-template<typename MatrixType>
-inline
-ScaledMatrix<VectorType>::ScaledMatrix(const MatrixType &mat, const double factor)
-  :
-  m(new_pointer_matrix_base(mat, VectorType())),
-  factor(factor)
-{}
-
-
-
-template<typename VectorType>
-template<typename MatrixType>
-inline
-void
-ScaledMatrix<VectorType>::initialize(const MatrixType &mat, const double f)
-{
-  if (m) delete m;
-  m = new_pointer_matrix_base(mat, VectorType());
-  factor = f;
-}
-
-
-
-template<typename VectorType>
-inline
-void
-ScaledMatrix<VectorType>::clear()
-{
-  if (m) delete m;
-  m = 0;
-}
-
-
-
-template<typename VectorType>
-inline
-ScaledMatrix<VectorType>::~ScaledMatrix()
-{
-  clear ();
-}
-
-
-template<typename VectorType>
-inline
-void
-ScaledMatrix<VectorType>::vmult (VectorType &w, const VectorType &v) const
-{
-  m->vmult(w, v);
-  w *= factor;
-}
-
-
-template<typename VectorType>
-inline
-void
-ScaledMatrix<VectorType>::Tvmult (VectorType &w, const VectorType &v) const
-{
-  m->Tvmult(w, v);
-  w *= factor;
-}
-
-
-//---------------------------------------------------------------------------
-
 template <typename VectorType>
 inline void
 MeanValueFilter::Tvmult(VectorType &, const VectorType &) const