From 648da151e511a3539968ca1aca53e9a2b26cfc1b Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 3 Sep 2024 17:56:03 -0600 Subject: [PATCH] Avoid some copying of data in make_consistent_in_parallel(). --- include/deal.II/lac/affine_constraints.h | 6 +-- .../lac/affine_constraints.templates.h | 40 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h index b2332a8db4..2e5f17b63c 100644 --- a/include/deal.II/lac/affine_constraints.h +++ b/include/deal.II/lac/affine_constraints.h @@ -2023,9 +2023,9 @@ public: * penalize certain terms when solving the biharmonic equation (see, * for example, step-47). * - * At the end of this function, the current object - * only stores constraints for degrees of freedom whose indices are - * listed in the second argument. In other words, while + * At the end of this function, the current object only stores constraints + * for degrees of freedom whose indices are listed in the + * second argument, @p constraints_to_make_consistent. In other words, while * DoFTools::make_hanging_node_constraints() may compute constraints * also for degrees of freedom at the interface between two ghost cells * (these DoFs are locally *relevant*), if you pass as second argument only diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h index 2a7131a21c..63ce3cce74 100644 --- a/include/deal.II/lac/affine_constraints.templates.h +++ b/include/deal.II/lac/affine_constraints.templates.h @@ -366,15 +366,15 @@ namespace internal { std::vector indices; indices.reserve(constraints_in.n_constraints()); - for (const auto &line : constraints_in.get_lines()) - indices.push_back(line.index); + for (const ConstraintLine &line : constraints_in.get_lines()) + if (locally_owned_dofs.is_element(line.index) == false) + indices.push_back(line.index); std::sort(indices.begin(), indices.end()); my_constraint_indices.add_indices(indices.begin(), indices.end()); } - // step 1: Identify the owners of DoFs we know to be constrained. - // Of course, we are likely to own a good share of the DoFs - // we know to be constrained -- and that is ok. + // step 1: Identify the owners of DoFs we know to be constrained but do + // not own. std::vector owners_of_my_constraints( my_constraint_indices.n_elements()); Utilities::MPI::internal::ComputeIndexOwner::ConsensusAlgorithmsPayload @@ -398,33 +398,41 @@ namespace internal { std::map> send_data; - for (unsigned int i = 0; i < owners_of_my_constraints.size(); ++i) + // For each constraint we know of but owned by another process, create a + // copy of the constraint and add it to the list of things to send to + // other processes: + for (unsigned int constraint_index = 0; + constraint_index < owners_of_my_constraints.size(); + ++constraint_index) { ConstraintLine entry; const types::global_dof_index index = - my_constraint_indices.nth_index_in_set(i); + my_constraint_indices.nth_index_in_set(constraint_index); entry.index = index; - - if (constraints_in.is_inhomogeneously_constrained(index)) - entry.inhomogeneity = constraints_in.get_inhomogeneity(index); - if (const std::vector> *constraints = constraints_in.get_constraint_entries(index)) entry.entries = *constraints; + entry.inhomogeneity = constraints_in.get_inhomogeneity(index); - if (owners_of_my_constraints[i] == my_rank) - locally_relevant_constraints.push_back(entry); - else - send_data[owners_of_my_constraints[i]].push_back(entry); + + Assert(owners_of_my_constraints[constraint_index] != my_rank, + ExcInternalError()); + send_data[owners_of_my_constraints[constraint_index]].push_back( + entry); } // Now exchange this data between processes: const std::map> received_data = Utilities::MPI::some_to_some(mpi_communicator, send_data); - // Finally collate everything into one array, sort, and make it unique: + // Finally join things with the constraints we know about and own + // ourselves, collate everything we received into one array, sort, + // and make it unique: + for (const ConstraintLine &line : constraints_in.get_lines()) + if (locally_owned_dofs.is_element(line.index)) + locally_relevant_constraints.push_back(line); for (const auto &[rank, constraints] : received_data) locally_relevant_constraints.insert(locally_relevant_constraints.end(), constraints.begin(), -- 2.39.5