From 3b486e3e6089c1cd268c12585182af5d0fbd2b72 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 20 Mar 2019 11:59:53 +0100 Subject: [PATCH] use range loop in SparsityTools::distribute_sparsity_pattern() --- source/lac/sparsity_tools.cc | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/source/lac/sparsity_tools.cc b/source/lac/sparsity_tools.cc index eeba2592de..2ec2422ad6 100644 --- a/source/lac/sparsity_tools.cc +++ b/source/lac/sparsity_tools.cc @@ -925,30 +925,27 @@ namespace SparsityTools for (DynamicSparsityPattern::size_type i = 0; i < rows_per_cpu.size(); ++i) start_index[i + 1] = start_index[i] + rows_per_cpu[i]; + IndexSet owned(start_index.back()); + owned.add_range(start_index[myid], start_index[myid] + rows_per_cpu[myid]); + + IndexSet myrange_non_owned(myrange); + myrange_non_owned.subtract_set(owned); + using map_vec_t = std::map>; map_vec_t send_data; { - unsigned int dest_cpu = 0; - const auto n_local_rel_rows = myrange.n_elements(); - for (DynamicSparsityPattern::size_type row_idx = 0; - row_idx < n_local_rel_rows; - ++row_idx) + unsigned int dest_cpu = 0; + for (const auto &row : myrange_non_owned) { - const auto row = myrange.nth_index_in_set(row_idx); - // calculate destination CPU while (row >= start_index[dest_cpu + 1]) ++dest_cpu; - // skip myself - if (dest_cpu == myid) - { - row_idx += rows_per_cpu[myid] - 1; - continue; - } + // we removed owned, thus shall not hit ourselves + Assert(dest_cpu != myid, ExcInternalError()); const auto rlen = dsp.row_length(row); -- 2.39.5