From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 4 Jul 2012 12:17:06 +0000 (+0000)
Subject: Make an input argument const to allow temporary objects. Break out a common idiom... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2a8cfb4c98ef493a575e674ddd14bdce77f7b5b;p=dealii-svn.git

Make an input argument const to allow temporary objects. Break out a common idiom and re-factor it into a function of its own.

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

diff --git a/deal.II/include/deal.II/numerics/fe_field_function.h b/deal.II/include/deal.II/numerics/fe_field_function.h
index 86720bbeff..3fa0933e32 100644
--- a/deal.II/include/deal.II/numerics/fe_field_function.h
+++ b/deal.II/include/deal.II/numerics/fe_field_function.h
@@ -23,6 +23,9 @@
 
 #include <deal.II/lac/vector.h>
 
+#include <boost/optional.hpp>
+
+
 DEAL_II_NAMESPACE_OPEN
 
 namespace Functions
@@ -151,7 +154,7 @@ namespace Functions
                                         * function. This will speed
                                         * things up a little.
                                         */
-      void set_active_cell(typename DH::active_cell_iterator &newcell);
+      void set_active_cell (const typename DH::active_cell_iterator &newcell);
 
                                        /**
                                         * Get ONE vector value at the
@@ -396,6 +399,19 @@ namespace Functions
                                         * components of this function.
                                         */
       const unsigned int n_components;
+
+				       /**
+					* Given a cell, return the
+					* reference coordinates of the
+					* given point within this cell
+					* if it indeed lies within the
+					* cell. Otherwise return an
+					* uninitialized
+					* boost::optional object.
+					*/
+      boost::optional<Point<dim> >
+      get_reference_coordinates (const typename DH::active_cell_iterator &cell,
+				 const Point<dim>                        &point) const;
   };
 }
 
diff --git a/deal.II/include/deal.II/numerics/fe_field_function.templates.h b/deal.II/include/deal.II/numerics/fe_field_function.templates.h
index 5af4c2960a..017519fce5 100644
--- a/deal.II/include/deal.II/numerics/fe_field_function.templates.h
+++ b/deal.II/include/deal.II/numerics/fe_field_function.templates.h
@@ -45,7 +45,7 @@ namespace Functions
   template <int dim, typename DH, typename VECTOR>
   void
   FEFieldFunction<dim, DH, VECTOR>::
-  set_active_cell(typename DH::active_cell_iterator &newcell)
+  set_active_cell(const typename DH::active_cell_iterator &newcell)
   {
     cell_hint.get() = newcell;
   }
@@ -414,31 +414,21 @@ namespace Functions
 				       // by throwing an
 				       // exception. handle
 				       // both
-      bool point_is_inside;
-      Point<dim> qp;
-      try
-	{
-	  qp =  mapping.transform_real_to_unit_cell(cell, points[0]);
-	  point_is_inside = GeometryInfo<dim>::is_inside_unit_cell(qp);
-	}
-      catch (const typename Mapping<dim>::ExcTransformationFailed &)
-	{
-	  point_is_inside = false;
-	}
-
-      if (point_is_inside)
+      boost::optional<Point<dim> >
+	qp = get_reference_coordinates (cell, points[0]);
+      if (!qp)
 	{
 	  const std::pair<typename DH::active_cell_iterator, Point<dim> >
 	    my_pair  = GridTools::find_active_cell_around_point
 	    (mapping, *dh, points[0]);
 	  cell = my_pair.first;
-	  qp = my_pair.second;
+	  qp.reset (my_pair.second);
 	  point_flags[0] = true;
 	}
 
 				       // Put in the first point.
       cells.push_back(cell);
-      qpoints.push_back(std::vector<Point<dim> >(1, qp));
+      qpoints.push_back(std::vector<Point<dim> >(1, qp.get()));
       maps.push_back(std::vector<unsigned int> (1, 0));
     }
 
@@ -468,22 +458,12 @@ namespace Functions
           if (point_flags[p] == false)
 	    {
 					       // same logic as above
-	      bool point_is_inside;
-	      Point<dim> qpoint;
-	      try
-		{
-		  qpoint =  mapping.transform_real_to_unit_cell(cells[c], points[p]);
-		  point_is_inside = GeometryInfo<dim>::is_inside_unit_cell(qpoint);
-		}
-	      catch (const typename Mapping<dim>::ExcTransformationFailed &)
-		{
-		  point_is_inside = false;
-		}
-
-	      if (point_is_inside)
+	      const boost::optional<Point<dim> >
+		qp = get_reference_coordinates (cells[c], points[p]);
+	      if (qp)
 		{
 		  point_flags[p] = true;
-		  qpoints[c].push_back(qpoint);
+		  qpoints[c].push_back(qp.get());
 		  maps[c].push_back(p);
 		}
 	      else
@@ -542,6 +522,31 @@ namespace Functions
 
     return c;
   }
+
+
+  template <int dim, typename DH, typename VECTOR>
+  boost::optional<Point<dim> >
+  FEFieldFunction<dim, DH, VECTOR>::
+  get_reference_coordinates (const typename DH::active_cell_iterator &cell,
+			     const Point<dim>                        &point) const
+  {
+    try
+      {
+	Point<dim> qp =  mapping.transform_real_to_unit_cell(cell, point);
+	if (GeometryInfo<dim>::is_inside_unit_cell(qp))
+	  return qp;
+	else
+	  return boost::optional<Point<dim> >();
+      }
+    catch (const typename Mapping<dim>::ExcTransformationFailed &)
+      {
+					 // transformation failed, so
+					 // assume the point is
+					 // outside
+	return boost::optional<Point<dim> >();
+      }
+  }
+
 }
 
 DEAL_II_NAMESPACE_CLOSE