From bc8ce146fe55e49401d210a0733b918d3967872a Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 30 May 2002 15:07:38 +0000 Subject: [PATCH] old exception replaced git-svn-id: https://svn.dealii.org/trunk@5944 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/matrices.h | 8 -- .../numerics/matrices.all_dimensions.cc | 12 +-- deal.II/deal.II/source/numerics/matrices.cc | 83 +++++++++++-------- 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/deal.II/deal.II/include/numerics/matrices.h b/deal.II/deal.II/include/numerics/matrices.h index fffc309c4b..2c3a158c0d 100644 --- a/deal.II/deal.II/include/numerics/matrices.h +++ b/deal.II/deal.II/include/numerics/matrices.h @@ -388,14 +388,6 @@ class MatrixCreator * Exception */ DeclException0 (ExcComponentMismatch); - /** - * Exception - */ - DeclException2 (ExcDimensionsDontMatch, - int, int, - << "The dimensions " << arg1 << " and " << arg2 - << " don't match."); - private: /** * Convenience abbreviation for diff --git a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc index df2171766f..d9dd753f2a 100644 --- a/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc +++ b/deal.II/deal.II/source/numerics/matrices.all_dimensions.cc @@ -31,11 +31,11 @@ MatrixTools::apply_boundary_values (const std::map &boundar const bool preserve_symmetry) { Assert (matrix.n() == matrix.m(), - ExcDimensionsDontMatch(matrix.n(), matrix.m())); + ExcDimensionMismatch(matrix.n(), matrix.m())); Assert (matrix.n() == right_hand_side.size(), - ExcDimensionsDontMatch(matrix.n(), right_hand_side.size())); + ExcDimensionMismatch(matrix.n(), right_hand_side.size())); Assert (matrix.n() == solution.size(), - ExcDimensionsDontMatch(matrix.n(), solution.size())); + ExcDimensionMismatch(matrix.n(), solution.size())); // if no boundary values are to be applied // simply return if (boundary_values.size() == 0) @@ -199,11 +199,11 @@ MatrixTools::apply_boundary_values (const std::map &boundar const unsigned int blocks = matrix.n_block_rows(); Assert (matrix.n() == matrix.m(), - ExcDimensionsDontMatch(matrix.n(), matrix.m())); + ExcDimensionMismatch(matrix.n(), matrix.m())); Assert (matrix.n() == right_hand_side.size(), - ExcDimensionsDontMatch(matrix.n(), right_hand_side.size())); + ExcDimensionMismatch(matrix.n(), right_hand_side.size())); Assert (matrix.n() == solution.size(), - ExcDimensionsDontMatch(matrix.n(), solution.size())); + ExcDimensionMismatch(matrix.n(), solution.size())); Assert (matrix.n_block_rows() == matrix.n_block_cols(), ExcMatrixNotBlockSquare()); Assert (matrix.get_sparsity_pattern().get_row_indices() == diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index 0d56e2c900..aef9a7cd0c 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -149,9 +149,6 @@ void MatrixCreator::create_mass_matrix_1 (const Mapping &mapping, cell_matrix.clear (); cell->get_dof_indices (dof_indices); - const FullMatrix &values = fe_values.get_shape_values (); - const std::vector &weights = fe_values.get_JxW_values (); - if (coefficient != 0) { if (coefficient->n_components==1) @@ -159,46 +156,66 @@ void MatrixCreator::create_mass_matrix_1 (const Mapping &mapping, coefficient->value_list (fe_values.get_quadrature_points(), coefficient_values); for (unsigned int point=0; pointvector_value_list (fe_values.get_quadrature_points(), coefficient_vector_values); for (unsigned int point=0; point