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 changes in compute_current_constraints(). #5411

Merged
merged 2 commits into from Oct 1, 2023
Merged

Some changes in compute_current_constraints(). #5411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19525d
Some changes in compute_current_constraints().
bangerth Sep 28, 2023
cd69527
Guard code for older versions of deal.II.
bangerth Sep 29, 2023
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
21 changes: 11 additions & 10 deletions source/simulator/core.cc
View file
Open in desktop
Expand Up @@ -655,13 +655,12 @@ namespace aspect
{
// We put the constraints we compute into a separate AffineConstraints<double> so we can check
// if the set of constraints has changed. If it did, we need to update the sparsity patterns.
AffineConstraints<double> new_current_constraints;
new_current_constraints.clear ();
AffineConstraints<double> new_current_constraints(
#if DEAL_II_VERSION_GTE(9,6,0)
new_current_constraints.reinit (dof_handler.locally_owned_dofs(), introspection.index_sets.system_relevant_set);
#else
new_current_constraints.reinit (introspection.index_sets.system_relevant_set);
dof_handler.locally_owned_dofs(),
#endif
introspection.index_sets.system_relevant_set
);
new_current_constraints.merge (constraints);
compute_current_velocity_boundary_constraints(new_current_constraints);

Expand Down Expand Up @@ -791,17 +790,19 @@ namespace aspect
}

// If at least one processor has different constraints, force rebuilding the matrices:
const bool any_constrained_dofs_set_changed = Utilities::MPI::sum(constraints_changed ? 1 : 0,
mpi_communicator) > 0;
const bool any_constrained_dofs_set_changed = (Utilities::MPI::sum(constraints_changed ? 1 : 0,
mpi_communicator)
> 0);
if (any_constrained_dofs_set_changed)
rebuild_sparsity_and_matrices = true;
current_constraints.clear();

#if DEAL_II_VERSION_GTE(9,6,0)
current_constraints.reinit (dof_handler.locally_owned_dofs(), introspection.index_sets.system_relevant_set);
current_constraints = std::move(new_current_constraints);
#else
current_constraints.clear();
current_constraints.reinit (introspection.index_sets.system_relevant_set);
#endif
current_constraints.copy_from(new_current_constraints);
#endif
current_constraints.close();

// TODO: We should use current_constraints.is_consistent_in_parallel()
Expand Down