From: Marc Fehling <mafehling.git@gmail.com>
Date: Tue, 22 Mar 2022 20:03:42 +0000 (-0600)
Subject: cell_weight: make assertion blocks smaller.
X-Git-Tag: v9.4.0-rc1~348^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78e07eec1aba208b2eea2369d0e8becdc2f1a5de;p=dealii.git

cell_weight: make assertion blocks smaller.
---

diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
index 773d56fe1a..64fef1ee4c 100644
--- a/source/distributed/tria.cc
+++ b/source/distributed/tria.cc
@@ -3361,19 +3361,14 @@ namespace parallel
               // get cell weights for a weighted repartitioning.
               const std::vector<unsigned int> cell_weights = get_cell_weights();
 
-#  ifdef DEBUG
               // verify that the global sum of weights is larger than 0
-              const auto local_weights_sum =
-                std::accumulate(cell_weights.begin(),
-                                cell_weights.end(),
-                                std::uint64_t(0));
-              const auto global_weights_sum =
-                Utilities::MPI::sum(local_weights_sum, this->mpi_communicator);
-              Assert(global_weights_sum > 0,
+              Assert(Utilities::MPI::sum(std::accumulate(cell_weights.begin(),
+                                                         cell_weights.end(),
+                                                         std::uint64_t(0)),
+                                         this->mpi_communicator) > 0,
                      ExcMessage(
                        "The global sum of weights over all active cells "
                        "is zero. Please verify how you generate weights."));
-#  endif
 
               PartitionWeights<dim, spacedim> partition_weights(cell_weights);
 
@@ -3543,18 +3538,14 @@ namespace parallel
           // get cell weights for a weighted repartitioning.
           const std::vector<unsigned int> cell_weights = get_cell_weights();
 
-#  ifdef DEBUG
           // verify that the global sum of weights is larger than 0
-          const auto local_weights_sum = std::accumulate(cell_weights.begin(),
-                                                         cell_weights.end(),
-                                                         std::uint64_t(0));
-          const auto global_weights_sum =
-            Utilities::MPI::sum(local_weights_sum, this->mpi_communicator);
-          Assert(global_weights_sum > 0,
+          Assert(Utilities::MPI::sum(std::accumulate(cell_weights.begin(),
+                                                     cell_weights.end(),
+                                                     std::uint64_t(0)),
+                                     this->mpi_communicator) > 0,
                  ExcMessage(
                    "The global sum of weights over all active cells "
                    "is zero. Please verify how you generate weights."));
-#  endif
 
           PartitionWeights<dim, spacedim> partition_weights(cell_weights);
 
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index 4e77809375..c0961adac3 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -3842,15 +3842,12 @@ namespace GridTools
                               shared_tria->get_communicator(),
                               cell_weights);
 
-#ifdef DEBUG
         // verify that the global sum of weights is larger than 0
-        const auto global_cell_sum = std::accumulate(cell_weights.begin(),
-                                                     cell_weights.end(),
-                                                     std::uint64_t(0));
-        Assert(global_cell_sum > 0,
+        Assert(std::accumulate(cell_weights.begin(),
+                               cell_weights.end(),
+                               std::uint64_t(0)) > 0,
                ExcMessage("The global sum of weights over all active cells "
                           "is zero. Please verify how you generate weights."));
-#endif
       }
 
     // Call the other more general function
@@ -3946,15 +3943,12 @@ namespace GridTools
                               shared_tria->get_communicator(),
                               cell_weights);
 
-#ifdef DEBUG
         // verify that the global sum of weights is larger than 0
-        const auto global_cell_sum = std::accumulate(cell_weights.begin(),
-                                                     cell_weights.end(),
-                                                     std::uint64_t(0));
-        Assert(global_cell_sum > 0,
+        Assert(std::accumulate(cell_weights.begin(),
+                               cell_weights.end(),
+                               std::uint64_t(0)) > 0,
                ExcMessage("The global sum of weights over all active cells "
                           "is zero. Please verify how you generate weights."));
-#endif
       }
 
     // Call the other more general function