From 285e4aa307cfc323ff92196e8f4a86b9bc878b49 Mon Sep 17 00:00:00 2001 From: guido Date: Mon, 2 Jul 2001 09:40:46 +0000 Subject: [PATCH] Template parameters fixed git-svn-id: https://svn.dealii.org/trunk@4780 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/shifted_matrix.h | 37 +++++++++++------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/deal.II/lac/include/lac/shifted_matrix.h b/deal.II/lac/include/lac/shifted_matrix.h index 96c40372b5..411e3fc10f 100644 --- a/deal.II/lac/include/lac/shifted_matrix.h +++ b/deal.II/lac/include/lac/shifted_matrix.h @@ -65,7 +65,7 @@ class ShiftedMatrix /** * Auxiliary vector. */ - VECTOR aux; + // VECTOR aux; /** * Shift parameter. */ @@ -83,7 +83,7 @@ class ShiftedMatrix * * @author Guido Kanschat, 2001 */ -template +template class ShiftedMatrixGeneralized { public: @@ -108,13 +108,11 @@ class ShiftedMatrixGeneralized /** * Matrix-vector-product. */ - template void vmult (VECTOR& dst, const VECTOR& src) const; /** * Residual. */ - template double residual (VECTOR& dst, const VECTOR& src, const VECTOR& rhs) const; private: @@ -127,6 +125,11 @@ class ShiftedMatrixGeneralized */ SmartPointer M; + /** + * Auxiliary vector. + */ + VECTOR aux; + /** * Shift parameter. */ @@ -190,10 +193,9 @@ ShiftedMatrix::residual (VECTOR& dst, //----------------------------------------------------------------------// - -template +template inline -ShiftedMatrixGeneralized +ShiftedMatrixGeneralized ::ShiftedMatrixGeneralized (const MATRIX& A, const MASSMATRIX& M, const double sigma) @@ -202,28 +204,24 @@ ShiftedMatrixGeneralized {} - -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 +template inline void -ShiftedMatrixGeneralized::vmult (VECTOR& dst, +ShiftedMatrixGeneralized::vmult (VECTOR& dst, const VECTOR& src) const { A.vmult(dst, src); @@ -236,10 +234,9 @@ ShiftedMatrixGeneralized::vmult (VECTOR& dst, } -template -template +template inline double -ShiftedMatrixGeneralized::residual (VECTOR& dst, +ShiftedMatrixGeneralized::residual (VECTOR& dst, const VECTOR& src, const VECTOR& rhs) const { -- 2.39.5