From 603fd681adbd515923076e8254e28f174b468c61 Mon Sep 17 00:00:00 2001
From: David Wells <wellsd2@rpi.edu>
Date: Sun, 21 Feb 2016 09:18:32 -0500
Subject: [PATCH] Prefer MatrixType to Matrix in the tutorials.

---
 examples/step-21/step-21.cc | 16 ++++++++--------
 examples/step-22/step-22.cc | 19 ++++++++++---------
 examples/step-31/step-31.cc | 16 ++++++++--------
 examples/step-43/step-43.cc | 16 ++++++++--------
 examples/step-45/step-45.cc | 16 ++++++++--------
 5 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/examples/step-21/step-21.cc b/examples/step-21/step-21.cc
index 3b821afd44..e5ecd5d9e6 100644
--- a/examples/step-21/step-21.cc
+++ b/examples/step-21/step-21.cc
@@ -461,31 +461,31 @@ namespace Step21
   // converges in at most <code>src.size()</code> steps.) As a consequence, we
   // set the maximum number of iterations equal to the maximum of the size of
   // the linear system and 200.
-  template <class Matrix>
+  template <class MatrixType>
   class InverseMatrix : public Subscriptor
   {
   public:
-    InverseMatrix (const Matrix &m);
+    InverseMatrix (const MatrixType &m);
 
     void vmult (Vector<double>       &dst,
                 const Vector<double> &src) const;
 
   private:
-    const SmartPointer<const Matrix> matrix;
+    const SmartPointer<const MatrixType> matrix;
   };
 
 
-  template <class Matrix>
-  InverseMatrix<Matrix>::InverseMatrix (const Matrix &m)
+  template <class MatrixType>
+  InverseMatrix<MatrixType>::InverseMatrix (const MatrixType &m)
     :
     matrix (&m)
   {}
 
 
 
-  template <class Matrix>
-  void InverseMatrix<Matrix>::vmult (Vector<double>       &dst,
-                                     const Vector<double> &src) const
+  template <class MatrixType>
+  void InverseMatrix<MatrixType>::vmult (Vector<double>       &dst,
+                                         const Vector<double> &src) const
   {
     SolverControl solver_control (std::max(src.size(), static_cast<std::size_t> (200)),
                                   1e-8*src.l2_norm());
diff --git a/examples/step-22/step-22.cc b/examples/step-22/step-22.cc
index 1986daab7f..b4ca614e5b 100644
--- a/examples/step-22/step-22.cc
+++ b/examples/step-22/step-22.cc
@@ -264,25 +264,26 @@ namespace Step22
   // <code>InverseMatrix</code> object is created. The member function
   // <code>vmult</code> is, as in step-20, a multiplication with a vector,
   // obtained by solving a linear system:
-  template <class Matrix, class Preconditioner>
+  template <class MatrixType, class Preconditioner>
   class InverseMatrix : public Subscriptor
   {
   public:
-    InverseMatrix (const Matrix         &m,
+    InverseMatrix (const MatrixType     &m,
                    const Preconditioner &preconditioner);
 
     void vmult (Vector<double>       &dst,
                 const Vector<double> &src) const;
 
   private:
-    const SmartPointer<const Matrix> matrix;
+    const SmartPointer<const MatrixType> matrix;
     const SmartPointer<const Preconditioner> preconditioner;
   };
 
 
-  template <class Matrix, class Preconditioner>
-  InverseMatrix<Matrix,Preconditioner>::InverseMatrix (const Matrix &m,
-                                                       const Preconditioner &preconditioner)
+  template <class MatrixType, class Preconditioner>
+  InverseMatrix<MatrixType,Preconditioner>::InverseMatrix
+  (const MatrixType     &m,
+   const Preconditioner &preconditioner)
     :
     matrix (&m),
     preconditioner (&preconditioner)
@@ -299,9 +300,9 @@ namespace Step22
   // inverse of the Laplace matrix &ndash; which is hence directly responsible
   // for the accuracy of the solution itself, so we can't choose a too large
   // tolerance, either.
-  template <class Matrix, class Preconditioner>
-  void InverseMatrix<Matrix,Preconditioner>::vmult (Vector<double>       &dst,
-                                                    const Vector<double> &src) const
+  template <class MatrixType, class Preconditioner>
+  void InverseMatrix<MatrixType,Preconditioner>::vmult (Vector<double>       &dst,
+                                                        const Vector<double> &src) const
   {
     SolverControl solver_control (src.size(), 1e-6*src.l2_norm());
     SolverCG<>    cg (solver_control);
diff --git a/examples/step-31/step-31.cc b/examples/step-31/step-31.cc
index 4a0bb5a6c0..83453cea51 100644
--- a/examples/step-31/step-31.cc
+++ b/examples/step-31/step-31.cc
@@ -266,11 +266,11 @@ namespace Step31
     // run-time exception into an assertion that fails and triggers a call to
     // <code>abort()</code>, allowing us to trace back in a debugger how we
     // got to the current place.
-    template <class Matrix, class Preconditioner>
+    template <class MatrixType, class Preconditioner>
     class InverseMatrix : public Subscriptor
     {
     public:
-      InverseMatrix (const Matrix         &m,
+      InverseMatrix (const MatrixType     &m,
                      const Preconditioner &preconditioner);
 
 
@@ -279,14 +279,14 @@ namespace Step31
                   const VectorType &src) const;
 
     private:
-      const SmartPointer<const Matrix> matrix;
+      const SmartPointer<const MatrixType> matrix;
       const Preconditioner &preconditioner;
     };
 
 
-    template <class Matrix, class Preconditioner>
-    InverseMatrix<Matrix,Preconditioner>::
-    InverseMatrix (const Matrix &m,
+    template <class MatrixType, class Preconditioner>
+    InverseMatrix<MatrixType,Preconditioner>::
+    InverseMatrix (const MatrixType     &m,
                    const Preconditioner &preconditioner)
       :
       matrix (&m),
@@ -295,10 +295,10 @@ namespace Step31
 
 
 
-    template <class Matrix, class Preconditioner>
+    template <class MatrixType, class Preconditioner>
     template <typename VectorType>
     void
-    InverseMatrix<Matrix,Preconditioner>::
+    InverseMatrix<MatrixType,Preconditioner>::
     vmult (VectorType       &dst,
            const VectorType &src) const
     {
diff --git a/examples/step-43/step-43.cc b/examples/step-43/step-43.cc
index 89910f98f0..c7b4e198e0 100644
--- a/examples/step-43/step-43.cc
+++ b/examples/step-43/step-43.cc
@@ -361,11 +361,11 @@ namespace Step43
   // darcy_matrix to match our problem.
   namespace LinearSolvers
   {
-    template <class Matrix, class Preconditioner>
+    template <class MatrixType, class Preconditioner>
     class InverseMatrix : public Subscriptor
     {
     public:
-      InverseMatrix (const Matrix         &m,
+      InverseMatrix (const MatrixType     &m,
                      const Preconditioner &preconditioner);
 
 
@@ -374,14 +374,14 @@ namespace Step43
                   const VectorType &src) const;
 
     private:
-      const SmartPointer<const Matrix> matrix;
+      const SmartPointer<const MatrixType> matrix;
       const Preconditioner &preconditioner;
     };
 
 
-    template <class Matrix, class Preconditioner>
-    InverseMatrix<Matrix,Preconditioner>::
-    InverseMatrix (const Matrix &m,
+    template <class MatrixType, class Preconditioner>
+    InverseMatrix<MatrixType,Preconditioner>::
+    InverseMatrix (const MatrixType     &m,
                    const Preconditioner &preconditioner)
       :
       matrix (&m),
@@ -390,10 +390,10 @@ namespace Step43
 
 
 
-    template <class Matrix, class Preconditioner>
+    template <class MatrixType, class Preconditioner>
     template <typename VectorType>
     void
-    InverseMatrix<Matrix,Preconditioner>::
+    InverseMatrix<MatrixType,Preconditioner>::
     vmult (VectorType       &dst,
            const VectorType &src) const
     {
diff --git a/examples/step-45/step-45.cc b/examples/step-45/step-45.cc
index f6b30e5949..fb8aae047a 100644
--- a/examples/step-45/step-45.cc
+++ b/examples/step-45/step-45.cc
@@ -182,11 +182,11 @@ namespace Step45
 
 
 
-  template <class Matrix, class Preconditioner>
+  template <class MatrixType, class Preconditioner>
   class InverseMatrix : public Subscriptor
   {
   public:
-    InverseMatrix (const Matrix         &m,
+    InverseMatrix (const MatrixType     &m,
                    const Preconditioner &preconditioner,
                    const IndexSet       &locally_owned,
                    const MPI_Comm       &mpi_communicator);
@@ -195,7 +195,7 @@ namespace Step45
                 const TrilinosWrappers::MPI::Vector &src) const;
 
   private:
-    const SmartPointer<const Matrix> matrix;
+    const SmartPointer<const MatrixType> matrix;
     const SmartPointer<const Preconditioner> preconditioner;
 
     const MPI_Comm *mpi_communicator;
@@ -204,9 +204,9 @@ namespace Step45
 
 
 
-  template <class Matrix, class Preconditioner>
-  InverseMatrix<Matrix,Preconditioner>::InverseMatrix
-  (const Matrix         &m,
+  template <class MatrixType, class Preconditioner>
+  InverseMatrix<MatrixType,Preconditioner>::InverseMatrix
+  (const MatrixType     &m,
    const Preconditioner &preconditioner,
    const IndexSet       &locally_owned,
    const MPI_Comm       &mpi_communicator)
@@ -219,8 +219,8 @@ namespace Step45
 
 
 
-  template <class Matrix, class Preconditioner>
-  void InverseMatrix<Matrix,Preconditioner>::vmult
+  template <class MatrixType, class Preconditioner>
+  void InverseMatrix<MatrixType,Preconditioner>::vmult
   (TrilinosWrappers::MPI::Vector       &dst,
    const TrilinosWrappers::MPI::Vector &src) const
   {
-- 
2.39.5