diff --git a/dune/tectonic/curvedfunction.hh b/dune/tectonic/curvedfunction.hh index 34ce4924a4ed68da58dff6f0277e807fcb3a3060..4c8a0350465fd62af26100fe4509b015f9d6c82f 100644 --- a/dune/tectonic/curvedfunction.hh +++ b/dune/tectonic/curvedfunction.hh @@ -20,7 +20,7 @@ template <class NonlinearityType> class CurvedFunction { void subDiff(double m, Interval<double> &D) const { VectorType x; - evaluate(m, x); + cartesian(m, x); VectorType tangent; tangentialDirection(m, tangent); @@ -40,7 +40,7 @@ template <class NonlinearityType> class CurvedFunction { domain[1] = 1; } - void evaluate(double m, VectorType &y) const { + void cartesian(double m, VectorType &y) const { y = 0; y.axpy(1 - m, x); y.axpy(m, dir); diff --git a/dune/tectonic/samplefunctional.hh b/dune/tectonic/samplefunctional.hh index 4197cf6cde52370f021d34f84b2282f101c4e077..b80bde693043061ced124f920b42a2ab336fa7d2 100644 --- a/dune/tectonic/samplefunctional.hh +++ b/dune/tectonic/samplefunctional.hh @@ -208,7 +208,7 @@ void minimise(Functional const J, typename Functional::SmallVector &x, // Since x is used in the computation of the rhs, do not write to it // directly SmallVector tmp; - JRest.evaluate(stepsize, tmp); + JRest.cartesian(stepsize, tmp); x = tmp; } }