From: Peter Munch Date: Sat, 28 Aug 2021 18:59:35 +0000 (+0200) Subject: Unify structure of MGTwoLevelTransfer::prolongate_and_add() and ::restrict_and_add() X-Git-Tag: v9.4.0-rc1~1018^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12720%2Fhead;p=dealii.git Unify structure of MGTwoLevelTransfer::prolongate_and_add() and ::restrict_and_add() --- diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.h index 8cdbf1f9f9..64bbd4aa1e 100644 --- a/include/deal.II/multigrid/mg_transfer_global_coarsening.h +++ b/include/deal.II/multigrid/mg_transfer_global_coarsening.h @@ -377,32 +377,6 @@ private: */ mutable LinearAlgebra::distributed::Vector vec_coarse; - /** - * Internal vector for performing manual constraint_coarse.distribute(), which - * is needed for acceptable performance. - */ - mutable LinearAlgebra::distributed::Vector vec_coarse_constraints; - - /** - * Constraint-entry indices for manually performing - * constraint_coarse.distribute() in MPI-local indices (for performance - * reasons). - */ - std::vector constraint_coarse_distribute_indices; - - /** - * Constraint-entry values for manually performing - * constraint_coarse.distribute() in MPI-local indices (for performance - * reasons). - */ - std::vector constraint_coarse_distribute_values; - - /** - * Pointers to the constraint entries for performing manual - * constraint_coarse.distribute(). - */ - std::vector constraint_coarse_distribute_ptr; - /** * Constraint-entry indices for performing manual * constraint_coarse.distribute_local_to_global(). diff --git a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h index 9c20a074e7..fb283c6ca3 100644 --- a/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h +++ b/include/deal.II/multigrid/mg_transfer_global_coarsening.templates.h @@ -986,81 +986,6 @@ namespace internal class MGTwoLevelTransferImplementation { - template - static void - precompute_constraints( - const DoFHandler & dof_handler_coarse, - const dealii::AffineConstraints &constraint_coarse, - const unsigned int mg_level_coarse, - MGTwoLevelTransfer> - &transfer) - { - std::vector dependencies; - - const auto &locally_owned_dofs = - mg_level_coarse == numbers::invalid_unsigned_int ? - dof_handler_coarse.locally_owned_dofs() : - dof_handler_coarse.locally_owned_mg_dofs(mg_level_coarse); - - for (const auto i : locally_owned_dofs) - { - if (constraint_coarse.is_constrained(i) == false) - continue; - - const auto constraints = constraint_coarse.get_constraint_entries(i); - - if (constraints) - for (const auto &p : *constraints) - if (locally_owned_dofs.is_element(p.first) == false) - dependencies.push_back(p.first); - } - - std::sort(dependencies.begin(), dependencies.end()); - dependencies.erase(std::unique(dependencies.begin(), dependencies.end()), - dependencies.end()); - - IndexSet locally_relevant_dofs(locally_owned_dofs.size()); - locally_relevant_dofs.add_indices(dependencies.begin(), - dependencies.end()); - - const auto partitioner = std::make_shared( - locally_owned_dofs, - locally_relevant_dofs, - dof_handler_coarse.get_communicator()); - - transfer.vec_coarse_constraints.reinit(partitioner); - - transfer.constraint_coarse_distribute_indices.clear(); - transfer.constraint_coarse_distribute_values.clear(); - transfer.constraint_coarse_distribute_ptr = {0}; - - for (const auto i : partitioner->locally_owned_range()) - { - Assert(constraint_coarse.is_inhomogeneously_constrained(i) == false, - ExcNotImplemented()); - - if (constraint_coarse.is_constrained(i)) - { - const auto constraints = - constraint_coarse.get_constraint_entries(i); - - if (constraints) - for (const auto &p : *constraints) - { - transfer.constraint_coarse_distribute_indices.emplace_back( - partitioner->global_to_local(p.first)); - transfer.constraint_coarse_distribute_values.emplace_back( - p.second); - } - } - - transfer.constraint_coarse_distribute_ptr.push_back( - transfer.constraint_coarse_distribute_indices.size()); - } - } - - - template static void precompute_restriction_constraints( @@ -1237,12 +1162,6 @@ namespace internal mg_level_fine, mg_level_coarse); - // copy constrain matrix; TODO: why only for the coarse level? - precompute_constraints(dof_handler_coarse, - constraint_coarse, - mg_level_coarse, - transfer); - // gather ranges for active FE indices on both fine and coarse dofhandlers std::array min_active_fe_indices = { {std::numeric_limits::max(), @@ -1882,11 +1801,6 @@ namespace internal dof_handler_fine.get_fe(fe_index_pair.first.second).degree; } - precompute_constraints(dof_handler_coarse, - constraint_coarse, - mg_level_coarse, - transfer); - const auto comm = dof_handler_coarse.get_communicator(); { transfer.partitioner_fine = @@ -2472,36 +2386,33 @@ MGTwoLevelTransfer>:: const auto vec_fine_ptr = use_dst_inplace ? &dst : &this->vec_fine; - // the following code is equivalent to: - // this->constraint_coarse.distribute(this->vec_coarse); - { - this->vec_coarse_constraints.copy_locally_owned_data_from(src); - this->vec_coarse_constraints.update_ghost_values(); - - for (unsigned int i = 0; i < constraint_coarse_distribute_ptr.size() - 1; - ++i) - if (constraint_coarse_distribute_ptr[i + 1] == - constraint_coarse_distribute_ptr[i]) - // not constrained entries - vec_coarse.local_element(i) = vec_coarse_constraints.local_element(i); - else - { - // constrained entries (ignoring homogeneous entries) - Number val = 0.0; - - for (unsigned int j = constraint_coarse_distribute_ptr[i]; - j < constraint_coarse_distribute_ptr[i + 1]; - ++j) - val += vec_coarse_constraints.local_element( - constraint_coarse_distribute_indices[j]) * - constraint_coarse_distribute_values[j]; - - vec_coarse.local_element(i) = val; - } - } - - this->vec_coarse - .update_ghost_values(); // note: make sure that ghost values are set + this->vec_coarse.copy_locally_owned_data_from(src); + this->vec_coarse.update_ghost_values(); + + // a helper function similar to FEEvaluation::read_dof_values() + const auto read_dof_values = [&](const auto &index, + const auto &global_vector) -> Number { + if (distribute_local_to_global_ptr[index + 1] == + distribute_local_to_global_ptr[index]) + return global_vector.local_element(index); + else if (((distribute_local_to_global_ptr[index + 1] - + distribute_local_to_global_ptr[index]) == 1 && + distribute_local_to_global_indices + [distribute_local_to_global_ptr[index]] == + numbers::invalid_unsigned_int) == false) + { + Number value = 0.0; + for (unsigned int j = distribute_local_to_global_ptr[index]; + j < distribute_local_to_global_ptr[index + 1]; + ++j) + value += + global_vector.local_element(distribute_local_to_global_indices[j]) * + distribute_local_to_global_values[j]; + return value; + } + else + return 0.0; + }; if (fine_element_is_continuous && (use_dst_inplace == false)) *vec_fine_ptr = Number(0.); @@ -2526,12 +2437,11 @@ MGTwoLevelTransfer>:: if (fine_element_is_continuous) for (unsigned int i = 0; i < scheme.dofs_per_cell_fine; ++i) vec_fine_ptr->local_element(indices_fine[i]) += - this->vec_coarse.local_element(indices_coarse[i]) * - weights[i]; + read_dof_values(indices_coarse[i], vec_coarse) * weights[i]; else for (unsigned int i = 0; i < scheme.dofs_per_cell_fine; ++i) vec_fine_ptr->local_element(indices_fine[i]) += - this->vec_coarse.local_element(indices_coarse[i]); + read_dof_values(indices_coarse[i], vec_coarse); indices_fine += scheme.dofs_per_cell_fine; indices_coarse += scheme.dofs_per_cell_coarse; @@ -2567,7 +2477,7 @@ MGTwoLevelTransfer>:: { for (unsigned int i = 0; i < scheme.dofs_per_cell_coarse; ++i) evaluation_data_coarse[i][v] = - this->vec_coarse.local_element(indices_coarse[i]); + read_dof_values(indices_coarse[i], this->vec_coarse); indices_coarse += scheme.dofs_per_cell_coarse; } @@ -2644,8 +2554,7 @@ MGTwoLevelTransfer>:: AlignedVector evaluation_data_fine; AlignedVector evaluation_data_coarse; - // a helper function similar to AffineConstraints::distribute_local_to_global - // but working with local indices + // a helper function similar to FEEvaluation::distribute_local_to_global() const auto distribute_local_to_global = [&](const auto &index, const auto &value, auto &global_vector) { if (distribute_local_to_global_ptr[index + 1] ==