Template VectorType in TrilinosWrappers::SparseMatrix::residual()

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index dfd90b522f532bf28db07c8bef04e26cf00da172..df9cbb3f6956c465d22a959443bdfdee6eba3545 100644 (file)
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -1575,10 +1575,9 @@ namespace TrilinosWrappers
      * running on one processor, since the matrix object is inherently
      * distributed. Otherwise, an exception will be thrown.
      */
+    template <typename VectorType>
     TrilinosScalar
-    residual(MPI::Vector       &dst,
-             const MPI::Vector &x,
-             const MPI::Vector &b) const;
+    residual(VectorType &dst, const VectorType &x, const VectorType &b) const;
 
     /**
      * Perform the matrix-matrix multiplication <tt>C = A * B</tt>, or, if an
@@ -3116,6 +3115,21 @@ namespace TrilinosWrappers
   }
 
 
+
+  template <typename VectorType>
+  inline TrilinosScalar
+  SparseMatrix::residual(VectorType       &dst,
+                         const VectorType &x,
+                         const VectorType &b) const
+  {
+    vmult(dst, x);
+    dst -= b;
+    dst *= -1.;
+
+    return dst.l2_norm();
+  }
+
+
   namespace internal
   {
     namespace LinearOperatorImplementation

diff --git a/source/lac/trilinos_sparse_matrix.cc b/source/lac/trilinos_sparse_matrix.cc
index f36ab6f8d1502b46878a40438aba55a5dc1a6b9f..bdfb9ca512a240f864eed13c45221d039fc05900 100644 (file)
--- a/source/lac/trilinos_sparse_matrix.cc
+++ b/source/lac/trilinos_sparse_matrix.cc
@@ -2127,20 +2127,6 @@ namespace TrilinosWrappers
 
 
 
-  TrilinosScalar
-  SparseMatrix::residual(MPI::Vector       &dst,
-                         const MPI::Vector &x,
-                         const MPI::Vector &b) const
-  {
-    vmult(dst, x);
-    dst -= b;
-    dst *= -1.;
-
-    return dst.l2_norm();
-  }
-
-
-
   namespace internals
   {
     using size_type = dealii::types::global_dof_index;