From: guido Date: Thu, 30 May 2002 15:00:07 +0000 (+0000) Subject: Old exception replaced X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef85c26c193996633651f50666ca0ece03ed669;p=dealii-svn.git Old exception replaced git-svn-id: https://svn.dealii.org/trunk@5943 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index ac6980f0af..211a3517e4 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -792,13 +792,6 @@ class SparseMatrix : public Subscriptor /** * Exception */ - DeclException2 (ExcDimensionsDontMatch, - int, int, - << "The dimensions " << arg1 << " and " << arg2 - << " do not match properly."); - /** - * Exception - */ DeclException2 (ExcInvalidIndex, int, int, << "The entry with index <" << arg1 << ',' << arg2 diff --git a/deal.II/lac/include/lac/sparse_matrix.templates.h b/deal.II/lac/include/lac/sparse_matrix.templates.h index 110702d024..1bcd1e3a60 100644 --- a/deal.II/lac/include/lac/sparse_matrix.templates.h +++ b/deal.II/lac/include/lac/sparse_matrix.templates.h @@ -282,8 +282,8 @@ SparseMatrix::vmult (Vector& dst, const Vector& { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); - Assert(m() == dst.size(), ExcDimensionsDontMatch(m(),dst.size())); - Assert(n() == src.size(), ExcDimensionsDontMatch(n(),src.size())); + Assert(m() == dst.size(), ExcDimensionMismatch(m(),dst.size())); + Assert(n() == src.size(), ExcDimensionMismatch(n(),src.size())); const unsigned int n_rows = m(); @@ -379,8 +379,8 @@ SparseMatrix::Tvmult (Vector& dst, const Vector& { Assert (val != 0, ExcMatrixNotInitialized()); Assert (cols != 0, ExcMatrixNotInitialized()); - Assert(n() == dst.size(), ExcDimensionsDontMatch(n(),dst.size())); - Assert(m() == src.size(), ExcDimensionsDontMatch(m(),src.size())); + Assert(n() == dst.size(), ExcDimensionMismatch(n(),dst.size())); + Assert(m() == src.size(), ExcDimensionMismatch(m(),src.size())); dst.clear (); @@ -402,8 +402,8 @@ SparseMatrix::vmult_add (Vector& dst, const Vectorrowstart[0]]; @@ -427,8 +427,8 @@ SparseMatrix::Tvmult_add (Vector& dst, const Vector::matrix_norm_square (const Vector& v) const { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); - Assert(m() == v.size(), ExcDimensionsDontMatch(m(),v.size())); - Assert(n() == v.size(), ExcDimensionsDontMatch(n(),v.size())); + Assert(m() == v.size(), ExcDimensionMismatch(m(),v.size())); + Assert(n() == v.size(), ExcDimensionMismatch(n(),v.size())); const unsigned int n_rows = m(); #ifdef DEAL_II_USE_MT @@ -559,8 +559,8 @@ SparseMatrix::matrix_scalar_product (const Vector& u, { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); - Assert(m() == u.size(), ExcDimensionsDontMatch(m(),u.size())); - Assert(n() == v.size(), ExcDimensionsDontMatch(n(),v.size())); + Assert(m() == u.size(), ExcDimensionMismatch(m(),u.size())); + Assert(n() == v.size(), ExcDimensionMismatch(n(),v.size())); const unsigned int n_rows = m(); #ifdef DEAL_II_USE_MT @@ -714,9 +714,9 @@ SparseMatrix::residual (Vector &dst, { Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); - Assert(m() == dst.size(), ExcDimensionsDontMatch(m(),dst.size())); - Assert(m() == b.size(), ExcDimensionsDontMatch(m(),b.size())); - Assert(n() == u.size(), ExcDimensionsDontMatch(n(),u.size())); + Assert(m() == dst.size(), ExcDimensionMismatch(m(),dst.size())); + Assert(m() == b.size(), ExcDimensionMismatch(m(),b.size())); + Assert(n() == u.size(), ExcDimensionMismatch(n(),u.size())); const unsigned int n_rows = m(); #ifdef DEAL_II_USE_MT @@ -958,7 +958,7 @@ SparseMatrix::SOR (Vector& dst, const number om) const Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); Assert (m() == n(), ExcMatrixNotSquare()); - Assert (m() == dst.size(), ExcDimensionsDontMatch(m(),dst.size())); + Assert (m() == dst.size(), ExcDimensionMismatch(m(),dst.size())); for (unsigned int row=0; row::TSOR (Vector& dst, const number om) const Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); Assert (m() == n(), ExcMatrixNotSquare()); - Assert (m() == dst.size(), ExcDimensionsDontMatch(m(),dst.size())); + Assert (m() == dst.size(), ExcDimensionMismatch(m(),dst.size())); for (unsigned int row=m(); row!=0;) { @@ -1005,8 +1005,8 @@ SparseMatrix::SOR_step (Vector &v, Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); Assert (m() == n(), ExcMatrixNotSquare()); - Assert (m() == v.size(), ExcDimensionsDontMatch(m(),v.size())); - Assert (m() == b.size(), ExcDimensionsDontMatch(m(),b.size())); + Assert (m() == v.size(), ExcDimensionMismatch(m(),v.size())); + Assert (m() == b.size(), ExcDimensionMismatch(m(),b.size())); for (unsigned int row=0; row::TSOR_step (Vector &v, Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); Assert (m() == n(), ExcMatrixNotSquare()); - Assert (m() == v.size(), ExcDimensionsDontMatch(m(),v.size())); - Assert (m() == b.size(), ExcDimensionsDontMatch(m(),b.size())); + Assert (m() == v.size(), ExcDimensionMismatch(m(),v.size())); + Assert (m() == b.size(), ExcDimensionMismatch(m(),b.size())); for (int row=m()-1; row>=0; --row) { @@ -1063,7 +1063,7 @@ SparseMatrix::SSOR (Vector& dst, const number om) const Assert (cols != 0, ExcMatrixNotInitialized()); Assert (val != 0, ExcMatrixNotInitialized()); Assert (m() == n(), ExcMatrixNotSquare()); - Assert (m() == dst.size(), ExcDimensionsDontMatch(m(),dst.size())); + Assert (m() == dst.size(), ExcDimensionMismatch(m(),dst.size())); const unsigned int n = dst.size(); unsigned int j;