From: bangerth Date: Fri, 20 Dec 2013 11:30:43 +0000 (+0000) Subject: Change my mind: call the new class InterpolatedTensorProductGridData instead. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24f569ef526b1b82f3a8254a48eb05aa371377b1;p=dealii-svn.git 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 a69b0d4ead..33b62f9f15 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -59,7 +59,7 @@ inconvenience this causes.

Specific improvements

    -
  1. New: There is now a new class InterpolatedTensorProductData that can +
  2. 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 267eaacd34..8ec2a3c11c 100644 --- 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 - class InterpolatedTensorProductData : public Function + class InterpolatedTensorProductGridData : public Function { public: /** @@ -1229,8 +1229,8 @@ namespace Functions * converting other data types into a table where you specify this * argument. */ - InterpolatedTensorProductData (const boost::array,dim> &coordinate_values, - const Table &data_values); + InterpolatedTensorProductGridData (const boost::array,dim> &coordinate_values, + const Table &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 8ca33e67ba..710ace921d 100644 --- a/deal.II/source/base/function_lib.cc +++ b/deal.II/source/base/function_lib.cc @@ -2267,9 +2267,9 @@ namespace Functions template - InterpolatedTensorProductData:: - InterpolatedTensorProductData(const boost::array,dim> &coordinate_values, - const Table &data_values) + InterpolatedTensorProductGridData:: + InterpolatedTensorProductGridData(const boost::array,dim> &coordinate_values, + const Table &data_values) : coordinate_values (coordinate_values), data_values (data_values) @@ -2341,8 +2341,8 @@ namespace Functions template double - InterpolatedTensorProductData::value(const Point &p, - const unsigned int component) const + InterpolatedTensorProductGridData::value(const Point &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 3fa85d08ea..16120c372e 100644 --- a/tests/base/functions_10.cc +++ b/tests/base/functions_10.cc @@ -68,7 +68,7 @@ void check () const Table data = fill(coordinates); - Functions::InterpolatedTensorProductData f(coordinates, data); + Functions::InterpolatedTensorProductGridData f(coordinates, data); // now choose a number of randomly chosen points inside the box and // verify that the functions returned are correct