From 6e694fda28b6b498dd769bc8bd35473ab9aa651d Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Thu, 16 Apr 2009 11:29:17 +0000 Subject: [PATCH] Fix an error in add_entries_local_to_global_function. git-svn-id: https://svn.dealii.org/trunk@18620 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/lac/constraint_matrix.templates.h | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/deal.II/lac/include/lac/constraint_matrix.templates.h b/deal.II/lac/include/lac/constraint_matrix.templates.h index 45e8a1cc6a..d0bf1f590f 100644 --- a/deal.II/lac/include/lac/constraint_matrix.templates.h +++ b/deal.II/lac/include/lac/constraint_matrix.templates.h @@ -979,16 +979,19 @@ namespace internals mutable std::vector > *constraints; }; + inline distributing::distributing (const unsigned int global_row, const unsigned int local_row) : global_row (global_row), local_row (local_row), constraints (0) {} + inline distributing::distributing (const distributing &in) : constraints (0) {*this = (in);} + inline distributing::~distributing () { if (constraints != 0) @@ -1003,11 +1006,9 @@ namespace internals { global_row = in.global_row; local_row = in.local_row; - if (constraints != 0) - { - delete constraints; - constraints = 0; - } + // the constraints pointer should not + // contain any data here. + Assert (constraints == 0, ExcInternalError()); if (in.constraints != 0) { @@ -1039,7 +1040,7 @@ namespace internals { typedef std::vector::iterator index_iterator; index_iterator pos, pos1; - distributing row_comparison (row); + distributing row_value (row); // check whether the list was really // sorted before entering here @@ -1050,23 +1051,21 @@ namespace internals if (my_indices.size() == 0 || my_indices.back().global_row < row) { - my_indices.push_back(row_comparison); + my_indices.push_back(row_value); pos1 = my_indices.end()-1; } else { - pos = std::lower_bound (my_indices.begin(), - my_indices.end(), - row_comparison); - + pos = std::lower_bound (my_indices.begin(),my_indices.end(), row_value); if (pos->global_row == row) pos1 = pos; else - pos1 = my_indices.insert(pos, row_comparison); - } + pos1 = my_indices.insert(pos, row_value); + } if (&*pos1->constraints == 0) - pos1->constraints = new std::vector > (1,constraint); + pos1->constraints = + new std::vector > (1,constraint); else pos1->constraints->push_back (constraint); } @@ -2113,7 +2112,7 @@ add_entries_local_to_global (const std::vector &local_dof_indices, // append it to the array of values. if (add_this == true) { - add_this_index: + add_this_index: *col_ptr++ = my_indices[j].global_row; } } @@ -2479,7 +2478,7 @@ add_entries_local_to_global (const std::vector &local_dof_indices, if (add_this == true) { add_this_index: - *col_ptr++ = my_indices[j].global_row; + *col_ptr++ = localized_indices[j]; } } } -- 2.39.5