Change my mind: call the new class InterpolatedTensorProductGridData instead.

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

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index a69b0d4ead284e61ae3ec79ad982b78d652250a8..33b62f9f15579277fa575cfc230aa402830e64de 100644 (file)
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -59,7 +59,7 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
-  <li> New: There is now a new class InterpolatedTensorProductData that can
+  <li> New: There is now a new class InterpolatedTensorProductGridData that can
   be used to (bi-/tri-)linearly interpolate data given on a tensor product
   mesh of $x$ (and $y$ and $z$) values, for example to evaluate experimentally
   determined coefficients, or to assess the accuracy of a solution by

diff --git a/deal.II/include/deal.II/base/function_lib.h b/deal.II/include/deal.II/base/function_lib.h
index 267eaacd342b31d61b0b092f11d5c12ee9ecadb6..8ec2a3c11ceea9580f4a0aa83b8c4431f78319a1 100644 (file)
--- a/deal.II/include/deal.II/base/function_lib.h
+++ b/deal.II/include/deal.II/base/function_lib.h
@@ -1211,7 +1211,7 @@ namespace Functions
    * @author Wolfgang Bangerth, 2013
    */
   template <int dim>
-  class InterpolatedTensorProductData : public Function<dim>
+  class InterpolatedTensorProductGridData : public Function<dim>
   {
     public:
       /**
@@ -1229,8 +1229,8 @@ namespace Functions
        *   converting other data types into a table where you specify this
        *   argument.
        */
-      InterpolatedTensorProductData (const boost::array<std::vector<double>,dim> &coordinate_values,
-                                     const Table<dim,double>                     &data_values);
+      InterpolatedTensorProductGridData (const boost::array<std::vector<double>,dim> &coordinate_values,
+                                         const Table<dim,double>                     &data_values);
 
       /**
        * Compute the value of the function set by bilinear interpolation of the

diff --git a/deal.II/source/base/function_lib.cc b/deal.II/source/base/function_lib.cc
index 8ca33e67ba2b638dadf822f30e3f951945a70f5c..710ace921d33b9ab9e12e1f8030a50e44a493056 100644 (file)
--- a/deal.II/source/base/function_lib.cc
+++ b/deal.II/source/base/function_lib.cc
@@ -2267,9 +2267,9 @@ namespace Functions
 
 
   template <int dim>
-  InterpolatedTensorProductData<dim>::
-  InterpolatedTensorProductData(const boost::array<std::vector<double>,dim> &coordinate_values,
-                                const Table<dim,double>                     &data_values)
+  InterpolatedTensorProductGridData<dim>::
+  InterpolatedTensorProductGridData(const boost::array<std::vector<double>,dim> &coordinate_values,
+                                    const Table<dim,double>                     &data_values)
   :
   coordinate_values (coordinate_values),
   data_values (data_values)
@@ -2341,8 +2341,8 @@ namespace Functions
 
   template <int dim>
   double
-  InterpolatedTensorProductData<dim>::value(const Point<dim> &p,
-                                            const unsigned int component) const
+  InterpolatedTensorProductGridData<dim>::value(const Point<dim> &p,
+                                                const unsigned int component) const
   {
     Assert (component == 0,
         ExcMessage ("This is a scalar function object, the component can only be zero."));
@@ -2430,9 +2430,9 @@ namespace Functions
   template class Monomial<3>;
   template class Bessel1<2>;
   template class Bessel1<3>;
-  template class InterpolatedTensorProductData<1>;
-  template class InterpolatedTensorProductData<2>;
-  template class InterpolatedTensorProductData<3>;
+  template class InterpolatedTensorProductGridData<1>;
+  template class InterpolatedTensorProductGridData<2>;
+  template class InterpolatedTensorProductGridData<3>;
 }
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/tests/base/functions_10.cc b/tests/base/functions_10.cc
index 3fa85d08ea537de6eac683f9b68bf05e8c184e6a..16120c372e5d78060991bf625581f3524b6c44c4 100644 (file)
--- a/tests/base/functions_10.cc
+++ b/tests/base/functions_10.cc
@@ -68,7 +68,7 @@ void check ()
 
   const Table<dim,double> data = fill(coordinates);
 
-  Functions::InterpolatedTensorProductData<dim> f(coordinates, data);
+  Functions::InterpolatedTensorProductGridData<dim> f(coordinates, data);
 
   // now choose a number of randomly chosen points inside the box and
   // verify that the functions returned are correct