From: wolf Date: Fri, 13 Nov 1998 12:44:03 +0000 (+0000) Subject: Replace Point by Tensor where necessary. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc313cc2cbc6709a6db59f1c876139d8e1b85001;p=dealii-svn.git Replace Point by Tensor where necessary. git-svn-id: https://svn.dealii.org/trunk@668 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/convergence/convergence.cc b/deal.II/deal.II/Attic/examples/convergence/convergence.cc index 71872f5a6d..b5c91be41b 100644 --- a/deal.II/deal.II/Attic/examples/convergence/convergence.cc +++ b/deal.II/deal.II/Attic/examples/convergence/convergence.cc @@ -110,7 +110,7 @@ class Solution : public Function { * Return the gradient of the function * at the given point. */ - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; @@ -133,7 +133,7 @@ double Solution<2>::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::gradient (const Point<2> &p) const { const double x = p(0), y = p(1); const double pi= 3.1415926536; diff --git a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc index 88897903fd..c83757d28a 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc +++ b/deal.II/deal.II/Attic/examples/error-estimation/error-estimation.cc @@ -112,13 +112,13 @@ class Solution { class GaussShape : public Function { public: virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; class Singular : public Function { public: virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; class Kink : public Function { @@ -129,7 +129,7 @@ class Solution { }; virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; }; @@ -181,7 +181,7 @@ double Solution<2>::GaussShape::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::GaussShape::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::GaussShape::gradient (const Point<2> &p) const { return Point<2> ((1-80.*p(0)*p(0))*p(1)*exp(-40*p.square()), (1-80.*p(1)*p(1))*p(0)*exp(-40*p.square())); }; @@ -193,7 +193,7 @@ double Solution<2>::Singular::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::Singular::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::Singular::gradient (const Point<2> &p) const { return 2./3.*pow(p.square(), -2./3.) * p; }; @@ -211,7 +211,7 @@ double Solution<2>::Kink::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::Kink::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::Kink::gradient (const Point<2> &p) const { const double s = p(1)-p(0)*p(0); return (1+4*theta(s))*Point<2>(-2*p(0),1); }; diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index 2778e09034..657f3c61fa 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -183,7 +183,7 @@ class Solution : public Function { * Return the gradient of the function * at the given point. */ - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; @@ -206,7 +206,7 @@ double Solution<2>::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::gradient (const Point<2> &p) const { const double x = p(0), y = p(1); const double pi= 3.1415926536; diff --git a/tests/big-tests/convergence/convergence.cc b/tests/big-tests/convergence/convergence.cc index 71872f5a6d..b5c91be41b 100644 --- a/tests/big-tests/convergence/convergence.cc +++ b/tests/big-tests/convergence/convergence.cc @@ -110,7 +110,7 @@ class Solution : public Function { * Return the gradient of the function * at the given point. */ - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; @@ -133,7 +133,7 @@ double Solution<2>::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::gradient (const Point<2> &p) const { const double x = p(0), y = p(1); const double pi= 3.1415926536; diff --git a/tests/big-tests/error-estimation/error-estimation.cc b/tests/big-tests/error-estimation/error-estimation.cc index 88897903fd..c83757d28a 100644 --- a/tests/big-tests/error-estimation/error-estimation.cc +++ b/tests/big-tests/error-estimation/error-estimation.cc @@ -112,13 +112,13 @@ class Solution { class GaussShape : public Function { public: virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; class Singular : public Function { public: virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; class Kink : public Function { @@ -129,7 +129,7 @@ class Solution { }; virtual double operator () (const Point &p) const; - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; }; @@ -181,7 +181,7 @@ double Solution<2>::GaussShape::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::GaussShape::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::GaussShape::gradient (const Point<2> &p) const { return Point<2> ((1-80.*p(0)*p(0))*p(1)*exp(-40*p.square()), (1-80.*p(1)*p(1))*p(0)*exp(-40*p.square())); }; @@ -193,7 +193,7 @@ double Solution<2>::Singular::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::Singular::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::Singular::gradient (const Point<2> &p) const { return 2./3.*pow(p.square(), -2./3.) * p; }; @@ -211,7 +211,7 @@ double Solution<2>::Kink::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::Kink::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::Kink::gradient (const Point<2> &p) const { const double s = p(1)-p(0)*p(0); return (1+4*theta(s))*Point<2>(-2*p(0),1); }; diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index 2778e09034..657f3c61fa 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -183,7 +183,7 @@ class Solution : public Function { * Return the gradient of the function * at the given point. */ - virtual Point gradient (const Point &p) const; + virtual Tensor<1,dim> gradient (const Point &p) const; }; @@ -206,7 +206,7 @@ double Solution<2>::operator () (const Point<2> &p) const { }; -Point<2> Solution<2>::gradient (const Point<2> &p) const { +Tensor<1,2> Solution<2>::gradient (const Point<2> &p) const { const double x = p(0), y = p(1); const double pi= 3.1415926536;