From ae489efa88713f8223cca47283f0e262c7009efa Mon Sep 17 00:00:00 2001 From: David Wells Date: Thu, 17 Dec 2015 15:09:47 -0500 Subject: [PATCH] Rename MASSMatrixType to fit the usual convention. --- include/deal.II/lac/shifted_matrix.h | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) 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 +template 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 > A; + SmartPointer > A; /** * Storage for mass matrix. */ - SmartPointer > M; + SmartPointer > M; /** * Auxiliary vector. @@ -213,35 +213,35 @@ ShiftedMatrix::residual (VectorType &dst, //--------------------------------------------------------------------------- -template +template inline -ShiftedMatrixGeneralized -::ShiftedMatrixGeneralized (const MatrixType &A, - const MASSMatrixType &M, - const double sigma) +ShiftedMatrixGeneralized +::ShiftedMatrixGeneralized (const MatrixType &A, + const MatrixType2 &M, + const double sigma) : A(&A), M(&M), sigma(sigma) {} -template +template inline void -ShiftedMatrixGeneralized::shift (const double s) +ShiftedMatrixGeneralized::shift (const double s) { sigma = s; } -template +template inline double -ShiftedMatrixGeneralized::shift () const +ShiftedMatrixGeneralized::shift () const { return sigma; } -template +template inline void -ShiftedMatrixGeneralized::vmult +ShiftedMatrixGeneralized::vmult (VectorType &dst, const VectorType &src) const { @@ -255,9 +255,9 @@ ShiftedMatrixGeneralized::vmult } -template +template inline double -ShiftedMatrixGeneralized::residual +ShiftedMatrixGeneralized::residual (VectorType &dst, const VectorType &src, const VectorType &rhs) const -- 2.39.5