From ad55b0410f64e1305bf57621e24a5bdd5f3cd356 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 28 Feb 2016 12:06:45 -0600
Subject: [PATCH] Simplify the implementation of a function.

In particular, write an assertion with less code. Also remove some
alias variables.
---
 source/grid/manifold.cc | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/source/grid/manifold.cc b/source/grid/manifold.cc
index 57a8a5250f..0a758164b1 100644
--- a/source/grid/manifold.cc
+++ b/source/grid/manifold.cc
@@ -51,21 +51,14 @@ Point<spacedim>
 Manifold<dim, spacedim>::
 get_new_point (const Quadrature<spacedim> &quad) const
 {
-  const std::vector<Point<spacedim> > &surrounding_points = quad.get_points();
-  const std::vector<double> &weights = quad.get_weights();
-  Point<spacedim> p;
+  Assert(std::abs(std::accumulate(quad.get_weights().begin(), quad.get_weights().end(), 0.0)-1.0) < 1e-10,
+         ExcMessage("The weights for the individual points should sum to 1!"));
 
-#ifdef DEBUG
-  double sum=0;
-  for (unsigned int i=0; i<weights.size(); ++i)
-    sum+= weights[i];
-  Assert(std::abs(sum-1.0) < 1e-10, ExcMessage("Weights should sum to 1!"));
-#endif
-
-  for (unsigned int i=0; i<surrounding_points.size(); ++i)
-    p += surrounding_points[i]*weights[i];
+  Point<spacedim> p;
+  for (unsigned int i=0; i<quad.size(); ++i)
+    p += quad.weight(i) * quad.point(i);
 
-  return project_to_manifold(surrounding_points, p);
+  return project_to_manifold(quad.get_points(), p);
 }
 
 
@@ -219,19 +212,12 @@ Point<spacedim>
 FlatManifold<dim, spacedim>::
 get_new_point (const Quadrature<spacedim> &quad) const
 {
+  Assert(std::abs(std::accumulate(quad.get_weights().begin(), quad.get_weights().end(), 0.0)-1.0) < 1e-10,
+         ExcMessage("The weights for the individual points should sum to 1!"));
+
   const std::vector<Point<spacedim> > &surrounding_points = quad.get_points();
   const std::vector<double> &weights = quad.get_weights();
 
-#ifdef DEBUG
-  double sum=0;
-  for (unsigned int i=0; i<weights.size(); ++i)
-    sum+= weights[i];
-  // Here it is correct to use tolerance as an absolute one, since
-  // this should be relative to unity.
-  Assert(std::abs(sum-1.0) < tolerance, ExcMessage("Weights should sum to 1!"));
-#endif
-
-
   Point<spacedim> p;
   Point<spacedim> dp;
   Point<spacedim> minP = periodicity;
-- 
2.39.5