From: David Wells <wellsd2@rpi.edu>
Date: Thu, 17 Dec 2015 20:09:47 +0000 (-0500)
Subject: Rename MASSMatrixType to fit the usual convention.
X-Git-Tag: v8.4.0-rc2~149^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae489efa88713f8223cca47283f0e262c7009efa;p=dealii.git

Rename MASSMatrixType to fit the usual convention.
---

diff --git a/include/deal.II/lac/shifted_matrix.h b/include/deal.II/lac/shifted_matrix.h
index 38ff84a326..2bb727396f 100644
--- a/include/deal.II/lac/shifted_matrix.h
+++ b/include/deal.II/lac/shifted_matrix.h
@@ -103,16 +103,16 @@ private:
  *
  * @author Guido Kanschat, 2001
  */
-template<typename MatrixType, class MASSMatrixType, class VectorType>
+template<typename MatrixType, class MatrixType2, class VectorType>
 class ShiftedMatrixGeneralized
 {
 public:
   /**
    * Constructor. Provide the base matrix and a shift parameter.
    */
-  ShiftedMatrixGeneralized (const MatrixType     &A,
-                            const MASSMatrixType &M,
-                            const double          sigma);
+  ShiftedMatrixGeneralized (const MatrixType  &A,
+                            const MatrixType2 &M,
+                            const double       sigma);
 
   /**
    * Set the shift parameter.
@@ -138,11 +138,11 @@ private:
   /**
    * Storage for base matrix.
    */
-  SmartPointer<const MatrixType,ShiftedMatrixGeneralized<MatrixType,MASSMatrixType,VectorType> > A;
+  SmartPointer<const MatrixType,ShiftedMatrixGeneralized<MatrixType,MatrixType2,VectorType> > A;
   /**
    * Storage for mass matrix.
    */
-  SmartPointer<const MASSMatrixType,ShiftedMatrixGeneralized<MatrixType,MASSMatrixType,VectorType> > M;
+  SmartPointer<const MatrixType2,ShiftedMatrixGeneralized<MatrixType,MatrixType2,VectorType> > M;
 
   /**
    * Auxiliary vector.
@@ -213,35 +213,35 @@ ShiftedMatrix<MatrixType>::residual (VectorType       &dst,
 
 
 //---------------------------------------------------------------------------
-template <typename MatrixType, class MASSMatrixType, class VectorType>
+template <typename MatrixType, class MatrixType2, class VectorType>
 inline
-ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>
-::ShiftedMatrixGeneralized (const MatrixType     &A,
-                            const MASSMatrixType &M,
-                            const double          sigma)
+ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>
+::ShiftedMatrixGeneralized (const MatrixType  &A,
+                            const MatrixType2 &M,
+                            const double       sigma)
   :
   A(&A), M(&M), sigma(sigma)
 {}
 
 
-template <typename MatrixType, class MASSMatrixType, class VectorType>
+template <typename MatrixType, class MatrixType2, class VectorType>
 inline void
-ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>::shift (const double s)
+ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::shift (const double s)
 {
   sigma = s;
 }
 
-template <typename MatrixType, class MASSMatrixType, class VectorType>
+template <typename MatrixType, class MatrixType2, class VectorType>
 inline double
-ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>::shift () const
+ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::shift () const
 {
   return sigma;
 }
 
 
-template <typename MatrixType, class MASSMatrixType, class VectorType>
+template <typename MatrixType, class MatrixType2, class VectorType>
 inline void
-ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>::vmult
+ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::vmult
 (VectorType       &dst,
  const VectorType &src) const
 {
@@ -255,9 +255,9 @@ ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>::vmult
 }
 
 
-template <typename MatrixType, class MASSMatrixType, class VectorType>
+template <typename MatrixType, class MatrixType2, class VectorType>
 inline double
-ShiftedMatrixGeneralized<MatrixType, MASSMatrixType, VectorType>::residual
+ShiftedMatrixGeneralized<MatrixType, MatrixType2, VectorType>::residual
 (VectorType       &dst,
  const VectorType &src,
  const VectorType &rhs) const