From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Tue, 18 Aug 2009 11:58:16 +0000 (+0000)
Subject: Updated version.
X-Git-Tag: v8.0.0~7269
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d75ff371b7cc37bbe715788ce8169b726ec5836;p=dealii.git

Updated version.


git-svn-id: https://svn.dealii.org/trunk@19299 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/deal.II/source/grid/tria_boundary_lib.cc b/deal.II/deal.II/source/grid/tria_boundary_lib.cc
index 871bf7d7b1..64a28a358e 100644
--- a/deal.II/deal.II/source/grid/tria_boundary_lib.cc
+++ b/deal.II/deal.II/source/grid/tria_boundary_lib.cc
@@ -306,19 +306,10 @@ get_intermediate_points_between_points (const Point<dim> &p0,
 				       // the axis of the cone.
       const double c = (x_i - x_0) * axis / axis.square ();
       const Point<dim> x_ip = x_0 + c * axis;
-				       // If the middle point is located
-				       // on the axis hand over the
-				       // current point itself, else
-				       // hand over the projection of it
-				       // on the boundary.
-      if (x_ip.norm () <= 1e-10 * x_i.norm ())
-	points[i] = x_i;
-      else {
-					 // Compute the projection of
-					 // the middle point on the
-					 // boundary of the cone.
-	points[i] = x_ip + get_radius (x_ip) *  (x_i - x_ip) / (x_i - x_ip).norm ();
-      }
+				       // Compute the projection of
+				       // the middle point on the
+				       // boundary of the cone.
+      points[i] = x_ip + get_radius (x_ip) *  (x_i - x_ip) / (x_i - x_ip).norm ();
     }
 }
 
@@ -337,19 +328,10 @@ get_new_point_on_line (const typename Triangulation<dim>::line_iterator &line) c
 				   // the cone.
   const double c = (middle - x_0) * axis / axis.square ();
   const Point<dim> middle_p = x_0 + c * axis;
-				   // If the middle point is located
-				   // on the axis return the middle
-				   // point itself, else return the
-				   // projection of it on the
-				   // boundary.
-  if (middle_p.norm () <= 1e-10 * middle.norm ())
-    return middle;
-  else {
-				     // Compute the projection of the
-				     // middle point on the boundary
-				     // of the cone.
-    return middle_p + get_radius (middle_p) * (middle - middle_p) / (middle - middle_p).norm ();
-  }
+				   // Compute the projection of the
+				   // middle point on the boundary
+				   // of the cone.
+  return middle_p + get_radius (middle_p) * (middle - middle_p) / (middle - middle_p).norm ();
 }
 
 
@@ -370,19 +352,10 @@ ConeBoundary<3>::get_new_point_on_quad (const Triangulation<3>::quad_iterator &q
 				   // the cone.
   const double c = (middle - x_0) * axis / axis.square ();
   const Point<3> middle_p = x_0 + c * axis;
-				   // If the middle point is located
-				   // on the axis return the middle
-				   // point itself, else return the
-				   // projection of it on the
-				   // boundary.
-  if (middle_p.norm () <= 1e-10 * middle.norm ())
-    return middle;
-  else {
-				     // Compute the projection of the
-				     // middle point on the boundary
-				     // of the cone.
-    return middle_p + get_radius (middle_p) * (middle - middle_p) / (middle - middle_p).norm ();
-  }
+				   // Compute the projection of the
+				   // middle point on the boundary
+				   // of the cone.
+  return middle_p + get_radius (middle_p) * (middle - middle_p) / (middle - middle_p).norm ();
 }