From: Peter Munch Date: Sun, 21 Feb 2021 15:14:45 +0000 (+0100) Subject: Fix tags of NoncontiguousPartitioner X-Git-Tag: v9.3.0-rc1~427^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d011e6ccdf8a87e33b78e73be5429cc68863b12;p=dealii.git Fix tags of NoncontiguousPartitioner --- diff --git a/include/deal.II/base/mpi_noncontiguous_partitioner.h b/include/deal.II/base/mpi_noncontiguous_partitioner.h index 58b9388e39..647257c30a 100644 --- a/include/deal.II/base/mpi_noncontiguous_partitioner.h +++ b/include/deal.II/base/mpi_noncontiguous_partitioner.h @@ -101,6 +101,9 @@ namespace Utilities * @pre The size of the @p temporary_storage vector has to be at least * temporary_storage_size. The reason for this is that this vector is * used as buffer for both sending and receiving data. + * + * @note Any value less than 10 is a valid value of + * @p communication_channel. */ template void @@ -123,6 +126,9 @@ namespace Utilities * * @pre The required size of the vectors are the same as in the functions * above. + * + * @note Any value less than 10 is a valid value of + * @p communication_channel. */ template void diff --git a/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h b/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h index 55e4ed7649..d97949bff6 100644 --- a/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h +++ b/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h @@ -308,12 +308,15 @@ namespace Utilities (void)requests; Assert(false, ExcNeedsMPI()); #else - AssertIndexRange(communication_channel, 10); AssertDimension(requests.size(), recv_ranks.size() + send_ranks.size()); const auto tag = communication_channel + - internal::Tags::noncontiguous_partitioner_update_ghost_values; + internal::Tags::noncontiguous_partitioner_update_ghost_values_start; + + AssertIndexRange( + tag, + internal::Tags::noncontiguous_partitioner_update_ghost_values_end + 1); // post recv AssertIndexRange(recv_ranks.size(), recv_ptr.size()); diff --git a/include/deal.II/base/mpi_tags.h b/include/deal.II/base/mpi_tags.h index 6a8e19d201..283003825e 100644 --- a/include/deal.II/base/mpi_tags.h +++ b/include/deal.II/base/mpi_tags.h @@ -132,7 +132,9 @@ namespace Utilities partitioner_export_end = partitioner_export_start + 200, /// NoncontiguousPartitioner::update_values - noncontiguous_partitioner_update_ghost_values, + noncontiguous_partitioner_update_ghost_values_start, + noncontiguous_partitioner_update_ghost_values_end = + noncontiguous_partitioner_update_ghost_values_start + 10, // Utilities::MPI::compute_union compute_union,