From 47b028afdc0cc371b8378b25b0268ecaa25d0f3e Mon Sep 17 00:00:00 2001
From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
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(index<row_length(row), ExcIndexRange(index, 0, row_length(row)));
 
   size_type c = 0;
+  size_type block_columns = 0; //sum of n_cols for all blocks to the left
   for (unsigned int b=0; b<columns; ++b)
     {
       unsigned int rowlen = sub_objects[row_index.first][b]->row_length (row_index.second);
       if (index<c+rowlen)
-        return c+sub_objects[row_index.first][b]->column_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