From 49661a0ba5fd59390963aedfe2caf4a3241828f5 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 2 Dec 2003 11:41:33 +0000 Subject: [PATCH] adjusting to new diagonal handling git-svn-id: https://svn.dealii.org/trunk@8222 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/sparse_decomposition.templates.h | 2 ++ deal.II/lac/include/lac/sparse_matrix.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deal.II/lac/include/lac/sparse_decomposition.templates.h b/deal.II/lac/include/lac/sparse_decomposition.templates.h index 2e6af4b844..9989f977f3 100644 --- a/deal.II/lac/include/lac/sparse_decomposition.templates.h +++ b/deal.II/lac/include/lac/sparse_decomposition.templates.h @@ -151,6 +151,8 @@ SparseLUDecomposition::reinit () template void SparseLUDecomposition::reinit (const SparsityPattern& sparsity) { + Assert (sparsity.optimize_diagonal(), + typename SparsityPattern::ExcDiagonalNotOptimized()); decomposed = false; if (true) { diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index 88bff51702..fbee8cf871 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -1343,7 +1343,7 @@ inline number SparseMatrix::diag_element (const unsigned int i) const { Assert (cols != 0, ExcMatrixNotInitialized()); - Assert (m() == n(), ExcMatrixNotSquare()); + Assert (cols->optimize_diagonal(), ExcMatrixNotSquare()); Assert (i::diag_element (const unsigned int i) { Assert (cols != 0, ExcMatrixNotInitialized()); - Assert (m() == n(), ExcMatrixNotSquare()); + Assert (cols->optimize_diagonal(), ExcMatrixNotSquare()); Assert (i