From: hartmann Date: Mon, 3 May 1999 16:41:25 +0000 (+0000) Subject: replace rank_ by rank X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07f1c891d298e68fca0523f1cf37a2610eb847e0;p=dealii-svn.git replace rank_ by rank git-svn-id: https://svn.dealii.org/trunk@1254 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/tensor_function.h b/deal.II/base/include/base/tensor_function.h index 36ef35f69d..3185530fa1 100644 --- a/deal.II/base/include/base/tensor_function.h +++ b/deal.II/base/include/base/tensor_function.h @@ -18,7 +18,7 @@ template class Vector; template class VectorFunction; -template class TensorFunction; +template class TensorFunction; /** * Base class for multi-valued functions. @@ -177,8 +177,8 @@ class VectorFunction // * * @author Guido Kanschat, 1999 */ -template -class TensorFunction // +template +class TensorFunction // : public VectorFunction { @@ -200,7 +200,7 @@ class TensorFunction // * Return the value of the function * at the given point. */ - virtual Tensor operator () (const Point &p) const; + virtual Tensor operator () (const Point &p) const; /** * Set #values# to the point values @@ -211,19 +211,19 @@ class TensorFunction // * array. */ virtual void value_list (const vector > &points, - vector > &values) const; + vector > &values) const; // /** // * Return one component of the value. // */ -// virtual double operator() (TensorIndex i, const Point& p) const; +// virtual double operator() (TensorIndex i, const Point& p) const; /** * Return the gradient of the function * at the given point. */ - virtual Tensor gradient (const Point &p) const; + virtual Tensor gradient (const Point &p) const; /** * Set #gradients# to the gradients of @@ -233,7 +233,7 @@ class TensorFunction // * the same size as the #points# array. */ virtual void gradient_list (const vector > &points, - vector > &gradients) const; + vector > &gradients) const; /** * See #VectorFunction#. diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index c51dcd5439..260a2a63e2 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -109,23 +109,23 @@ VectorFunction::Extractor::gradient_list (const vector > &points // TensorFunction ////////////////////////////////////////////////////////////////////// -template -TensorFunction::TensorFunction (const double initial_time) +template +TensorFunction::TensorFunction (const double initial_time) : - VectorFunction(pow(dim,rank_), initial_time) + VectorFunction(pow(dim,rank), initial_time) {}; -template -TensorFunction::~TensorFunction () +template +TensorFunction::~TensorFunction () {}; -// template +// template // double -// TensorFunction::operator () (TensorIndex i, +// TensorFunction::operator () (TensorIndex i, // const Point &) const // { // int k=i(0); @@ -136,19 +136,19 @@ TensorFunction::~TensorFunction () // }; -template -Tensor -TensorFunction::operator() (const Point &) const +template +Tensor +TensorFunction::operator() (const Point &) const { Assert (false, ExcPureFunctionCalled()); - return Tensor(); + return Tensor(); }; -template +template void -TensorFunction::value_list (const vector > &points, - vector > &values) const +TensorFunction::value_list (const vector > &points, + vector > &values) const { Assert (values.size() == points.size(), ExcVectorHasWrongSize(values.size(), points.size())); @@ -158,20 +158,20 @@ TensorFunction::value_list (const vector > &points, }; -template -Tensor -TensorFunction::gradient (const Point &) const +template +Tensor +TensorFunction::gradient (const Point &) const { Assert (false, ExcPureFunctionCalled()); - return Tensor(); + return Tensor(); }; -template +template void -TensorFunction::gradient_list (const vector > &points, - vector > &gradients) const +TensorFunction::gradient_list (const vector > &points, + vector > &gradients) const { Assert (gradients.size() == points.size(), ExcVectorHasWrongSize(gradients.size(), points.size())); @@ -181,17 +181,17 @@ TensorFunction::gradient_list (const vector > &points, }; -template void -TensorFunction::value (const Point &p, +template void +TensorFunction::value (const Point &p, Vector &erg) const { - Tensor h = operator()(p); + Tensor h = operator()(p); h.unroll(erg); } -template void -TensorFunction::value_list (const vector > & points, +template void +TensorFunction::value_list (const vector > & points, vector > & values) const { Assert (values.size() == points.size(), @@ -203,8 +203,8 @@ TensorFunction::value_list (const vector > & points, } -template void -TensorFunction::gradient_list (const vector > &, +template void +TensorFunction::gradient_list (const vector > &, vector > > &) const { Assert (false, ExcPureFunctionCalled());