Tpetra: Replace TrilinosScalar

diff --git a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
index 772202b2e279e54411ea5e3ba9aeeff27ea4acd6..c7057b1ebe713b42bba5a6270f21192b9e1866da 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
@@ -424,7 +424,7 @@ namespace LinearAlgebra
        * back to an uncompressed state.
        */
       void
-      add(const size_type i, const size_type j, const TrilinosScalar value);
+      add(const size_type i, const size_type j, const Number value);
 
       /**
        * Add an array of values given by <tt>values</tt> in the given global
@@ -440,12 +440,12 @@ namespace LinearAlgebra
        * back to an uncompressed state.
        */
       void
-      add(const size_type       row,
-          const size_type       n_cols,
-          const size_type      *col_indices,
-          const TrilinosScalar *values,
-          const bool            elide_zero_values      = true,
-          const bool            col_indices_are_sorted = false);
+      add(const size_type  row,
+          const size_type  n_cols,
+          const size_type *col_indices,
+          const Number    *values,
+          const bool       elide_zero_values      = true,
+          const bool       col_indices_are_sorted = false);
 
       /**
        * Set the element (<i>i,j</i>) to @p value.
@@ -836,9 +836,9 @@ namespace LinearAlgebra
 
     template <typename Number, typename MemorySpace>
     inline void
-    SparseMatrix<Number, MemorySpace>::add(const size_type      i,
-                                           const size_type      j,
-                                           const TrilinosScalar value)
+    SparseMatrix<Number, MemorySpace>::add(const size_type i,
+                                           const size_type j,
+                                           const Number    value)
     {
       add(i, 1, &j, &value, false);
     }

diff --git a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
index 6e9ae879b54af81f21312a245fe5511328364a42..5e635cbf74c7a52f41e9a208c8ce1e2ca28ef1e9 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
+++ b/include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
@@ -632,11 +632,11 @@ namespace LinearAlgebra
     template <typename Number, typename MemorySpace>
     void
     SparseMatrix<Number, MemorySpace>::add(
-      const size_type       row,
-      const size_type       n_cols,
-      const size_type      *col_indices,
-      const TrilinosScalar *values,
-      const bool            elide_zero_values,
+      const size_type  row,
+      const size_type  n_cols,
+      const size_type *col_indices,
+      const Number    *values,
+      const bool       elide_zero_values,
       const bool /*col_indices_are_sorted*/)
     {
       AssertIndexRange(row, this->m());

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h
index 9ac1bd8cc2985860b31698da498fa7f0a4d34a97..5725daa0a9f4fd0cba0693968a69c189381f7785 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_vector.h
+++ b/include/deal.II/lac/trilinos_tpetra_vector.h
@@ -549,8 +549,8 @@ namespace LinearAlgebra
        * stored in @p values to the vector components specified by @p indices.
        */
       void
-      add(const std::vector<size_type>      &indices,
-          const std::vector<TrilinosScalar> &values);
+      add(const std::vector<size_type> &indices,
+          const std::vector<Number>    &values);
 
 
       /**
@@ -943,8 +943,8 @@ namespace LinearAlgebra
 
     template <typename Number, typename MemorySpace>
     inline void
-    Vector<Number, MemorySpace>::add(const std::vector<size_type>      &indices,
-                                     const std::vector<TrilinosScalar> &values)
+    Vector<Number, MemorySpace>::add(const std::vector<size_type> &indices,
+                                     const std::vector<Number>    &values)
     {
       // if we have ghost values, do not allow
       // writing to this vector at all.