From 4d0715eb67ff5ce4dfeb7a484bbda47fd5ab7696 Mon Sep 17 00:00:00 2001
From: David Wells <wellsd2@rpi.edu>
Date: Thu, 12 Nov 2015 14:45:07 -0500
Subject: [PATCH] More MATRIX to MatrixType

---
 tests/slepc/solve_01.cc  |  4 ++--
 tests/slepc/solve_04.cc  |  4 ++--
 tests/slepc/testmatrix.h | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/slepc/solve_01.cc b/tests/slepc/solve_01.cc
index b28c2d4d31..278548a860 100644
--- a/tests/slepc/solve_01.cc
+++ b/tests/slepc/solve_01.cc
@@ -35,11 +35,11 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<class SOLVER, class MATRIX, typename VectorType>
+template<class SOLVER, typename MatrixType, typename VectorType>
 void
 check_solve( SOLVER &solver,
              const SolverControl &solver_control,
-             const MATRIX &A, const MATRIX &B,
+             const MatrixType &A, const MatrixType &B,
              std::vector<VectorType> &u, std::vector<PetscScalar > &v)
 {
   deallog << "Solver type: " << typeid(solver).name() << std::endl;
diff --git a/tests/slepc/solve_04.cc b/tests/slepc/solve_04.cc
index dd63e04d9f..5a15b3a1e7 100644
--- a/tests/slepc/solve_04.cc
+++ b/tests/slepc/solve_04.cc
@@ -35,11 +35,11 @@
 #include <deal.II/lac/vector_memory.h>
 #include <typeinfo>
 
-template<class SOLVER, class MATRIX, typename VectorType>
+template<class SOLVER, typename MatrixType, typename VectorType>
 void
 check_solve( SOLVER &solver,
              const SolverControl &solver_control,
-             const MATRIX &A,
+             const MatrixType &A,
              std::vector<VectorType> &u, std::vector<PetscScalar > &v)
 {
   deallog << "Solver type: " << typeid(solver).name() << std::endl;
diff --git a/tests/slepc/testmatrix.h b/tests/slepc/testmatrix.h
index 969b4c29ec..07f00073c6 100644
--- a/tests/slepc/testmatrix.h
+++ b/tests/slepc/testmatrix.h
@@ -29,8 +29,8 @@ public:
   /**
    * Fill the matrix with values.
    */
-  template <typename MATRIX>
-  void diag(MATRIX &) const;
+  template <typename MatrixType>
+  void diag(MatrixType &) const;
 
   template <typename number>
   void gnuplot_print(std::ostream &, const Vector<number> &) const;
@@ -75,10 +75,10 @@ FDDiagMatrix::diag_structure(SP &structure) const
 }
 
 
-template<typename MATRIX>
+template<typename MatrixType>
 inline
 void
-FDDiagMatrix::diag(MATRIX &A) const
+FDDiagMatrix::diag(MatrixType &A) const
 {
   for (unsigned int i=0; i<=ny-2; i++)
     {
@@ -131,8 +131,8 @@ public:
   /**
    * Fill the matrix with values.
    */
-  template <typename MATRIX>
-  void three_point(MATRIX &) const;
+  template <typename MatrixType>
+  void three_point(MatrixType &) const;
 
 private:
   /**
@@ -168,10 +168,10 @@ FD1DLaplaceMatrix::three_point_structure(SP &structure) const
 }
 
 
-template<typename MATRIX>
+template<typename MatrixType>
 inline
 void
-FD1DLaplaceMatrix::three_point(MATRIX &A) const
+FD1DLaplaceMatrix::three_point(MatrixType &A) const
 {
   for (unsigned int i=0; i<=n-2; i++)
     {
-- 
2.39.5