From: cvs Date: Fri, 15 Oct 1999 15:17:15 +0000 (+0000) Subject: Rename the operator() and the functions returning all components of a Function object... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6aeeed100c521509eb11f0be57b79b69fe6465;p=dealii-svn.git Rename the operator() and the functions returning all components of a Function object. Small other cleanups. git-svn-id: https://svn.dealii.org/trunk@1777 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/base/Makefile b/tests/base/Makefile index 030a0155ce..963b110a0f 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -74,7 +74,7 @@ logtest-o-files = $(logtest-cc-files:.cc=.o) endif logtest.testcase: $(logtest-o-files) $(libraries) - $(CXX) $(flags) -o $@ $^ + @$(CXX) $(flags) -o $@ $^ ############################################################ @@ -89,7 +89,7 @@ tensor-o-files = $(tensor-cc-files:.cc=.o) endif tensor.testcase: $(tensor-o-files) $(libraries) - $(CXX) $(flags) -o $@ $^ + @$(CXX) $(flags) -o $@ $^ @@ -105,7 +105,7 @@ reference-o-files = $(reference-cc-files:.cc=.o) endif reference.testcase: $(reference-o-files) $(libraries) - $(CXX) $(flags) -o $@ $^ + @$(CXX) $(flags) -o $@ $^ @@ -128,7 +128,7 @@ target1-o-files = $(target1-cc-files:.cc=.o) endif target1: $(target1-o-files) $(libraries) - $(CXX) $(flags) -o $@ $^ + @$(CXX) $(flags) -o $@ $^ ############################################################ diff --git a/tests/deal.II/helmholtz1.th b/tests/deal.II/helmholtz1.th index 99fc58809a..7510fab761 100644 --- a/tests/deal.II/helmholtz1.th +++ b/tests/deal.II/helmholtz1.th @@ -41,7 +41,7 @@ Helmholtz::build_all(MATRIX& A, double v = fe.shape_value(i,k); elvec(i) += fe.JxW(k) * - rhs(loc) * v; + rhs.value(loc) * v; //Trial function loop for (unsigned j=0;j -class RHSFunction - : - public Function +class RHSFunction : public Function { public: - virtual double operator() (const Point&) const; -// virtual Tensor<1,dim> gradient (const Point &p) const; + virtual double value (const Point&, + const unsigned int) const; }; -class MGSmootherLAC - : - public MGSmootherBase + +class MGSmootherLAC : public MGSmootherBase { private: SmartPointer > >matrices; @@ -149,7 +146,8 @@ main() template double -RHSFunction::operator() (const Point&) const +RHSFunction::value (const Point&, + const unsigned int) const { return 1.; } diff --git a/tests/deal.II/mglocal.cc b/tests/deal.II/mglocal.cc index 979a30412b..536f5a1d07 100644 --- a/tests/deal.II/mglocal.cc +++ b/tests/deal.II/mglocal.cc @@ -47,11 +47,13 @@ class RHSFunction public Function { public: - virtual double operator() (const Point&) const; -// virtual Tensor<1,dim> gradient (const Point &p) const; + virtual double value (const Point&, + const unsigned int ) const; }; -extern void write_gnuplot (const MGDoFHandler<2>& dofs, const Vector& v, unsigned int level, +extern void write_gnuplot (const MGDoFHandler<2>& dofs, + const Vector& v, + unsigned int level, ostream &out); main() @@ -163,7 +165,8 @@ main() template double -RHSFunction::operator() (const Point&p) const +RHSFunction::value (const Point&p, + const unsigned int) const { // return 1.; diff --git a/tests/deal.II/wave-test-3.cc b/tests/deal.II/wave-test-3.cc index 424b0f5cc5..add3f9a5a1 100644 --- a/tests/deal.II/wave-test-3.cc +++ b/tests/deal.II/wave-test-3.cc @@ -3747,7 +3747,8 @@ class InitialValues { public: class EigenMode : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926539; return sin(2*pi*p(0))*sin(2*pi*p(1)); }; @@ -3755,7 +3756,8 @@ class InitialValues { class Bump : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double width = 0.1; const double r2 = p.square(); return exp(-r2/width/width) * (r2 { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double width = 0.02; const double r2 = p.square(); return exp(-r2/width/width) * (r2 { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double width = 0.1; Point shift; shift(0) = 0.5; @@ -3792,7 +3796,8 @@ class InitialValues { class CenterKink : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double width = 0.1; const double r = sqrt(p.square()); return (r { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double width = 0.1; const double r = sqrt(p.square()); return (r { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { Point earthquake_center = p; earthquake_center(1) -= 5500; const double r2 = earthquake_center.square(); @@ -3828,7 +3835,8 @@ class Coefficients { public: class Kink : public Function { public: - inline virtual double operator () (const Point &p) const { + inline virtual double value (const Point &p, + const unsigned int) const { // always let the kink be // in direction of the last // variable @@ -3836,14 +3844,16 @@ class Coefficients { }; virtual void value_list (const vector > &points, - vector &values) const { + vector &values, + const unsigned int) const { Assert (values.size() == points.size(), ExcVectorHasWrongSize(values.size(), points.size())); for (unsigned int i=0; iKink::operator()(points[i]); + values[i] = this->Kink::value(points[i], 0); }; - virtual Tensor<1,dim> gradient (const Point &p) const { + virtual Tensor<1,dim> gradient (const Point &p, + const unsigned int) const { Tensor<1,dim> tmp; if (fabs(p(1)-1./5.) < 1./400.) tmp[1] = 100; @@ -3851,37 +3861,42 @@ class Coefficients { }; virtual void gradient_list (const vector > &points, - vector > &gradients) const { + vector > &gradients, + const unsigned int) const { for (unsigned int i=0; i { public: - inline virtual double operator () (const Point &p) const { + inline virtual double value (const Point &p, + const unsigned int) const { return 1+8*p(1)*p(1); }; virtual void value_list (const vector > &points, - vector &values) const { + vector &values, + const unsigned int) const { Assert (values.size() == points.size(), ExcVectorHasWrongSize(values.size(), points.size())); for (unsigned int i=0; iGradient::operator()(points[i]); + values[i] = this->Gradient::value(points[i], 0); }; - virtual Tensor<1,dim> gradient (const Point &p) const { + virtual Tensor<1,dim> gradient (const Point &p, + const unsigned int) const { Tensor<1,dim> tmp; tmp[1] = 16*p(1); return tmp; }; virtual void gradient_list (const vector > &points, - vector > &gradients) const { + vector > &gradients, + const unsigned int) const { for (unsigned int i=0; i { public: - inline virtual double operator () (const Point &p) const { + inline virtual double value (const Point &p, + const unsigned int) const { const double r=sqrt(p.square()); // this data just ad hoc, not taken // from the PREM @@ -3897,14 +3913,16 @@ class Coefficients { }; virtual void value_list (const vector > &points, - vector &values) const { + vector &values, + const unsigned int) const { Assert (values.size() == points.size(), ExcVectorHasWrongSize(values.size(), points.size())); for (unsigned int i=0; iPreliminaryEarthModel::operator()(points[i]); + values[i] = this->PreliminaryEarthModel::value(points[i], 0); }; - virtual Tensor<1,dim> gradient (const Point &p) const { + virtual Tensor<1,dim> gradient (const Point &p, + const unsigned int) const { // gradient is derivative with // respect to r times a unit vector // in direction of p @@ -3915,9 +3933,10 @@ class Coefficients { }; virtual void gradient_list (const vector > &points, - vector > &gradients) const { + vector > &gradients, + const unsigned int) const { for (unsigned int i=0; i { public: - inline virtual double operator () (const Point &p) const { + inline virtual double value (const Point &p, + const unsigned int) const { const double x=p(0), y=p(1); const double pi = 3.1415926539; @@ -3935,23 +3955,26 @@ class Coefficients { }; virtual void value_list (const vector > &points, - vector &values) const { + vector &values, + const unsigned int) const { Assert (values.size() == points.size(), ExcVectorHasWrongSize(values.size(), points.size())); for (unsigned int i=0; iDistorted::operator()(points[i]); + values[i] = this->Distorted::value(points[i], 0); }; - virtual Tensor<1,dim> gradient (const Point &) const { + virtual Tensor<1,dim> gradient (const Point &, + const unsigned int) const { // return zero, since we don't know // how to do better (regularize?) return Tensor<1,dim>(); }; virtual void gradient_list (const vector > &points, - vector > &gradients) const { + vector > &gradients, + const unsigned int) const { for (unsigned int i=0; i { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; // if ((get_time()<0.4) && (p(0)==0)) if (p(0)==0) @@ -3977,7 +4001,8 @@ class BoundaryValues { class WaveFromLeft_v : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; // if ((get_time()<0.4) && (p(0)==0)) if (p(0)==0) @@ -3990,7 +4015,8 @@ class BoundaryValues { class FastWaveFromLeft_u : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; if ((get_time()<0.2) && (p(0)==0)) return sin(pi*get_time()/0.2)*sin(pi*get_time()/0.2); @@ -4001,7 +4027,8 @@ class BoundaryValues { class FastWaveFromLeft_v : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; if ((get_time()<0.2) && (p(0)==0)) return 2*pi/0.2*sin(pi*get_time()/0.2)*cos(pi*get_time()/0.2); @@ -4013,7 +4040,8 @@ class BoundaryValues { class WaveFromLeftCenter_u : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; if ((0.4 <= p(1)) && (p(1) <= 0.6) && (p(0) <= 0.5)) return (p(1)-0.4)*(0.6-p(1)) * sin(pi*get_time()/0.2); @@ -4024,7 +4052,8 @@ class BoundaryValues { class WaveFromLeftCenter_v : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; if ((0.4 <= p(1)) && (p(1) <= 0.6) && (p(0) <= 0.5)) return pi/0.2*(p(1)-0.4)*(0.6-p(1)) * cos(pi*get_time()/0.2); @@ -4036,7 +4065,8 @@ class BoundaryValues { class WaveFromLeftBottom_u : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; const double r = sqrt(p.square()); // let the radius of @@ -4058,7 +4088,8 @@ class BoundaryValues { class WaveFromLeftBottom_v : public Function { public: - virtual double operator () (const Point &p) const { + virtual double value (const Point &p, + const unsigned int) const { const double pi = 3.1415926536; const double r = sqrt(p.square()); // let the radius of @@ -5493,9 +5524,11 @@ void TimeStep_Wave::create_matrices () // if a coefficient is constant, get // its value if (density_constant) - fill_n (density_values.begin(), n_q_points, (*parameters.density)(Point())); + fill_n (density_values.begin(), n_q_points, + parameters.density->value(Point())); if (stiffness_constant) - fill_n (stiffness_values.begin(), n_q_points, (*parameters.stiffness)(Point())); + fill_n (stiffness_values.begin(), n_q_points, + parameters.stiffness->value(Point())); FEValues fe_values (fe, quadrature,