From 223d10b808e1742c657fb661047d30015e023175 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 1 Jun 2017 18:57:12 +0200 Subject: [PATCH] Fix documentation TrilinosWrappers::SparseMatrix --- include/deal.II/lac/trilinos_sparse_matrix.h | 89 ++++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h index a780f40e99..f6fe4e919c 100644 --- a/include/deal.II/lac/trilinos_sparse_matrix.h +++ b/include/deal.II/lac/trilinos_sparse_matrix.h @@ -1476,17 +1476,17 @@ namespace TrilinosWrappers * * This function can be called with several different vector objects, * namely TrilinosWrappers::MPI::Vector as well as deal.II's own vector - * classes Vector and LinearAlgebra::distributed::Vector. + * classes, e.g., Vector and LinearAlgebra::distributed::Vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * When using vectors of type TrilinosWrappers::MPI::Vector, the vector + * @p dst has to be initialized with the same IndexSet that was used for + * the row indices of the matrix and the vector @p src has to be + * initialized with the same IndexSet that was used for the column indices + * of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. */ template void vmult (VectorType &dst, @@ -1501,17 +1501,17 @@ namespace TrilinosWrappers * * This function can be called with several different vector objects, * namely TrilinosWrappers::MPI::Vector as well as deal.II's own vector - * classes Vector and LinearAlgebra::distributed::Vector. + * classes, e.g., Vector and LinearAlgebra::distributed::Vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * When using vectors of type TrilinosWrappers::MPI::Vector, the vector + * @p src has to be initialized with the same IndexSet that was used for + * the row indices of the matrix and the vector @p dst has to be + * initialized with the same IndexSet that was used for the column indices + * of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. */ template void Tvmult (VectorType &dst, @@ -1525,17 +1525,17 @@ namespace TrilinosWrappers * * This function can be called with several different vector objects, * namely TrilinosWrappers::MPI::Vector as well as deal.II's own vector - * classes Vector and LinearAlgebra::distributed::Vector. + * classes, e.g., Vector and LinearAlgebra::distributed::Vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * When using vectors of type TrilinosWrappers::MPI::Vector, the vector + * @p dst has to be initialized with the same IndexSet that was used for + * the row indices of the matrix and the vector @p src has to be + * initialized with the same IndexSet that was used for the column indices + * of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. * */ template @@ -1551,17 +1551,17 @@ namespace TrilinosWrappers * * This function can be called with several different vector objects, * namely TrilinosWrappers::MPI::Vector as well as deal.II's own vector - * classes Vector and LinearAlgebra::distributed::Vector. + * classes, e.g., Vector and LinearAlgebra::distributed::Vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * When using vectors of type TrilinosWrappers::MPI::Vector, the vector + * @p src has to be initialized with the same IndexSet that was used for + * the row indices of the matrix and the vector @p dst has to be + * initialized with the same IndexSet that was used for the column indices + * of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. */ template void Tvmult_add (VectorType &dst, @@ -1581,15 +1581,12 @@ namespace TrilinosWrappers * the Trilinos wrapper class) since Trilinos doesn't support this * operation and needs a temporary vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * The vector has to be initialized with the same IndexSet the matrix + * was initialized with. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. */ TrilinosScalar matrix_norm_square (const MPI::Vector &v) const; @@ -1601,15 +1598,16 @@ namespace TrilinosWrappers * the Trilinos wrapper class) since Trilinos doesn't support this * operation and needs a temporary vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * The vector @p u has to be initialized with the same IndexSet that + * was used for the row indices of the matrix and the vector @p v has + * to be initialized with the same IndexSet that was used for the + * column indices of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. + * + * This function is only implemented for square matrices. */ TrilinosScalar matrix_scalar_product (const MPI::Vector &u, const MPI::Vector &v) const; @@ -1621,15 +1619,14 @@ namespace TrilinosWrappers * * Source x and destination dst must not be the same vector. * - * When using a vector of type TrilinosWrappers::MPI::Vector, both vectors - * have to be distributed vectors generated using the same Map as was used - * for the matrix rows and columns in case you work on a distributed - * memory architecture, using the interface in the - * TrilinosWrappers::MPI::Vector class. + * The vectors @p dst and @p b have to be initialized with the same + * IndexSet that was used for the row indices of the matrix and the vector + * @p x has to be initialized with the same IndexSet that was used for the + * column indices of the matrix. * * In case of a localized Vector, this function will only work when * running on one processor, since the matrix object is inherently - * distributed. Otherwise, and exception will be thrown. + * distributed. Otherwise, an exception will be thrown. */ TrilinosScalar residual (MPI::Vector &dst, const MPI::Vector &x, -- 2.39.5