Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tpetra: Replace TrilinosScalar #16604

Merged
merged 1 commit into from
Feb 8, 2024
Merged

Tpetra: Replace TrilinosScalar #16604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions include/deal.II/lac/trilinos_tpetra_sparse_matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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);
}
Expand Down
10 changes: 5 additions & 5 deletions include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions include/deal.II/lac/trilinos_tpetra_vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);


/**
Expand Down Expand Up @@ -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.
Expand Down