From: Daniel Arndt Date: Wed, 7 Feb 2024 21:59:41 +0000 (-0500) Subject: Tpetra: Replace TrilinosScalar X-Git-Tag: relicensing~63^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16604%2Fhead;p=dealii.git 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 772202b2e2..c7057b1ebe 100644 --- 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 values 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,j) to @p value. @@ -836,9 +836,9 @@ namespace LinearAlgebra template inline void - SparseMatrix::add(const size_type i, - const size_type j, - const TrilinosScalar value) + SparseMatrix::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 6e9ae879b5..5e635cbf74 100644 --- 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 void SparseMatrix::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 9ac1bd8cc2..5725daa0a9 100644 --- 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 &indices, - const std::vector &values); + add(const std::vector &indices, + const std::vector &values); /** @@ -943,8 +943,8 @@ namespace LinearAlgebra template inline void - Vector::add(const std::vector &indices, - const std::vector &values) + Vector::add(const std::vector &indices, + const std::vector &values) { // if we have ghost values, do not allow // writing to this vector at all.