From 1816d50742e8cf7fb492f5bf54eb42826ceb8aee Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 16 Jun 2013 20:07:38 +0000 Subject: [PATCH] merge fix for BlockSparsityPattern::column_number to mainline git-svn-id: https://svn.dealii.org/trunk@29826 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/block_sparsity_pattern.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deal.II/include/deal.II/lac/block_sparsity_pattern.h b/deal.II/include/deal.II/lac/block_sparsity_pattern.h index d520376d17..46d196eeb3 100644 --- a/deal.II/include/deal.II/lac/block_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/block_sparsity_pattern.h @@ -1350,12 +1350,14 @@ BlockCompressedSimpleSparsityPattern::column_number (const size_type row, Assert(indexrow_length (row_index.second); if (indexcolumn_number(row_index.second, index-c); + return block_columns+sub_objects[row_index.first][b]->column_number(row_index.second, index-c); c += rowlen; + block_columns += sub_objects[row_index.first][b]->n_cols(); } Assert(false, ExcInternalError()); -- 2.39.5