From 22733f9cc0de3578e02bcc21a122cde8de4b15cb Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 2 Feb 2013 21:44:55 +0000 Subject: [PATCH] Fix a few deprecated function calls. git-svn-id: https://svn.dealii.org/trunk@28217 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/numerics/matrix_tools.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/deal.II/source/numerics/matrix_tools.cc b/deal.II/source/numerics/matrix_tools.cc index c115999a26..5ab18c9bcf 100644 --- a/deal.II/source/numerics/matrix_tools.cc +++ b/deal.II/source/numerics/matrix_tools.cc @@ -1947,14 +1947,13 @@ namespace MatrixTools Vector &right_hand_side, const bool eliminate_columns) { - // Require that diagonals are first - // in each row - Assert (matrix.get_sparsity_pattern().optimize_diagonal(), - typename SparsityPattern::ExcDiagonalNotOptimized()); Assert (matrix.n() == right_hand_side.size(), ExcDimensionMismatch(matrix.n(), right_hand_side.size())); Assert (matrix.n() == solution.size(), ExcDimensionMismatch(matrix.n(), solution.size())); + Assert (matrix.n() == matrix.m(), + ExcDimensionMismatch(matrix.n(), matrix.m())); + // if no boundary values are to be applied // simply return if (boundary_values.size() == 0) @@ -2120,11 +2119,6 @@ namespace MatrixTools right_hand_side.get_block_indices (), ExcBlocksDontMatch ()); - for (unsigned int i=0; i