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 58b9388e3912d5b8d51c60ae024d509ea56f1406..647257c30a73f4fb56abf32d423bdcabd89ff3a2 100644 (file)
--- 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 <typename Number>
       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 <typename Number>
       void

diff --git a/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h b/include/deal.II/base/mpi_noncontiguous_partitioner.templates.h
index 55e4ed7649f5abfbc7a3682adc49801e220ad747..d97949bff604a43a8a8b778827f8456b1614de2d 100644 (file)
--- 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 6a8e19d2015f2048c9723809f5b954318caff3f7..283003825e999173f473759e9948562755a9f771 100644 (file)
--- 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,