From fc23279aad69abd078ad8d974ec53f7ccfdd85e9 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 13 Jan 2013 20:03:55 +0000 Subject: [PATCH] Remove more uses of a deprecated function. git-svn-id: https://svn.dealii.org/trunk@28040 0785d39b-7218-0410-832d-ea1e28bc413d --- .../deal.II/lac/constraint_matrix.templates.h | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/deal.II/include/deal.II/lac/constraint_matrix.templates.h b/deal.II/include/deal.II/lac/constraint_matrix.templates.h index 1d21d55f8b..587e4fc30b 100644 --- a/deal.II/include/deal.II/lac/constraint_matrix.templates.h +++ b/deal.II/include/deal.II/lac/constraint_matrix.templates.h @@ -297,15 +297,16 @@ ConstraintMatrix::condense (const SparseMatrix &uncondensed, else // line must be distributed { - for (unsigned int j=uncondensed_struct.get_rowstart_indices()[row]; - j::const_iterator + p = uncondensed.begin(row); + p != uncondensed.end(row); ++p) // for each column: distribute - if (new_line[uncondensed_struct.get_column_numbers()[j]] != -1) + if (new_line[p->column()] != -1) // column is not constrained for (unsigned int q=0; q!=next_constraint->entries.size(); ++q) condensed.add (new_line[next_constraint->entries[q].first], - new_line[uncondensed_struct.get_column_numbers()[j]], - uncondensed.global_entry(j) * + new_line[p->column()], + p->value() * next_constraint->entries[q].second); else @@ -315,24 +316,24 @@ ConstraintMatrix::condense (const SparseMatrix &uncondensed, // let c point to the constraint // of this column std::vector::const_iterator c = lines.begin(); - while (c->line != uncondensed_struct.get_column_numbers()[j]) + while (c->line != p->column()) ++c; - for (unsigned int p=0; p!=c->entries.size(); ++p) + for (unsigned int r=0; r!=c->entries.size(); ++r) for (unsigned int q=0; q!=next_constraint->entries.size(); ++q) condensed.add (new_line[next_constraint->entries[q].first], - new_line[c->entries[p].first], - uncondensed.global_entry(j) * - next_constraint->entries[q].second * - c->entries[p].second); + new_line[c->entries[r].first], + p->value() * + next_constraint->entries[r].second * + c->entries[r].second); if (use_vectors == true) for (unsigned int q=0; q!=next_constraint->entries.size(); ++q) condensed_vector (new_line[next_constraint->entries[q].first]) - -= uncondensed.global_entry(j) * + -= p->value() * next_constraint->entries[q].second * c->inhomogeneity; - }; + } // condense the vector if (use_vectors == true) -- 2.39.5