Merge pull request #14369 from peterrum/ExcSourceEqualsDestination

Fix assert message
dealii · Oct 23, 2022 · e72d67b · e72d67b
2 parents aa053f4 + 9a0c6ca
commit e72d67b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/include/deal.II/lac/chunk_sparse_matrix.h b/include/deal.II/lac/chunk_sparse_matrix.h
@@ -1395,7 +1395,7 @@ class ChunkSparseMatrix : public virtual Subscriptor
    * Exception
    */
   DeclExceptionMsg(ExcSourceEqualsDestination,
-                   "You are attempting an operation on two matrices that "
+                   "You are attempting an operation on two vectors that "
                    "are the same object, but the operation requires that the "
                    "two objects are in fact different.");
   /** @} */

diff --git a/include/deal.II/lac/full_matrix.h b/include/deal.II/lac/full_matrix.h
@@ -1109,7 +1109,7 @@ class FullMatrix : public Table<2, number>
    * Exception
    */
   DeclExceptionMsg(ExcSourceEqualsDestination,
-                   "You are attempting an operation on two matrices that "
+                   "You are attempting an operation on two vectors that "
                    "are the same object, but the operation requires that the "
                    "two objects are in fact different.");
   /**

diff --git a/include/deal.II/lac/petsc_matrix_base.h b/include/deal.II/lac/petsc_matrix_base.h
@@ -934,7 +934,7 @@ namespace PETScWrappers
      * Exception
      */
     DeclExceptionMsg(ExcSourceEqualsDestination,
-                     "You are attempting an operation on two matrices that "
+                     "You are attempting an operation on two vectors that "
                      "are the same object, but the operation requires that the "
                      "two objects are in fact different.");
 

diff --git a/include/deal.II/lac/sparse_matrix.h b/include/deal.II/lac/sparse_matrix.h
@@ -1710,7 +1710,7 @@ class SparseMatrix : public virtual Subscriptor
    * Exception
    */
   DeclExceptionMsg(ExcSourceEqualsDestination,
-                   "You are attempting an operation on two matrices that "
+                   "You are attempting an operation on two vectors that "
                    "are the same object, but the operation requires that the "
                    "two objects are in fact different.");
   /** @} */

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -1867,7 +1867,7 @@ namespace TrilinosWrappers
      * Exception
      */
     DeclExceptionMsg(ExcSourceEqualsDestination,
-                     "You are attempting an operation on two matrices that "
+                     "You are attempting an operation on two vectors that "
                      "are the same object, but the operation requires that the "
                      "two objects are in fact different.");
 

diff --git a/include/deal.II/lac/trilinos_sparsity_pattern.h b/include/deal.II/lac/trilinos_sparsity_pattern.h
@@ -948,15 +948,6 @@ namespace TrilinosWrappers
                    << "The entry with index <" << arg1 << ',' << arg2
                    << "> does not exist.");
 
-    /**
-     * Exception
-     */
-    DeclExceptionMsg(
-      ExcSourceEqualsDestination,
-      "You are attempting an operation on two sparsity patterns that "
-      "are the same object, but the operation requires that the "
-      "two objects are in fact different.");
-
     /**
      * Exception
      */