Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some more small AffineConstraints code improvements. #15713

Merged
merged 1 commit into from
Jul 12, 2023
Merged

Some more small AffineConstraints code improvements. #15713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 7 additions & 10 deletions include/deal.II/lac/affine_constraints.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,10 +712,10 @@ AffineConstraints<number>::close()
#ifdef DEBUG
size_type iteration = 0;
#endif
while (true)
bool chained_constraint_replaced = false;
do
{
bool chained_constraint_replaced = false;

chained_constraint_replaced = false;
for (ConstraintLine &line : lines)
{
#ifdef DEBUG
Expand All @@ -729,7 +729,7 @@ AffineConstraints<number>::close()
// have appended in this go around) and see whether they are
// further constrained. ignore elements that we don't store on
// the current processor
size_type entry = 0;
unsigned int entry = 0;
while (entry < line.entries.size())
if (((local_lines.size() == 0) ||
(local_lines.is_element(line.entries[entry].first))) &&
Expand All @@ -755,7 +755,7 @@ AffineConstraints<number>::close()
// where we will later process them once more
//
// we can of course only do that if the DoF that we are
// currently handle is constrained by a linear combination
// currently handling is constrained by a linear combination
// of other dofs:
if (constrained_line.entries.size() > 0)
{
Expand Down Expand Up @@ -808,18 +808,15 @@ AffineConstraints<number>::close()
++entry;
}

// if we didn't do anything in this round, then quit the loop
if (chained_constraint_replaced == false)
break;

#ifdef DEBUG
// increase iteration count. note that we should not iterate more
// times than there are constraints, since this puts a natural upper
// bound on the length of constraint chains
++iteration;
Assert(iteration <= lines.size(), ExcInternalError());
Assert(iteration <= lines.size() + 1, ExcInternalError());
tamiko marked this conversation as resolved.
Show resolved Hide resolved
#endif
}
while (chained_constraint_replaced == true);

// Finally sort the entries and re-scale them if necessary. in this step,
// we also throw out duplicates as mentioned above. moreover, as some
Expand Down