diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh index 37475bd9f8ed6d1a3ab58bb130083c4b9a284b75..7cf815b70f6b8d85e24902aee9c8a43fa3b4dc9d 100644 --- a/dune/tectonic/minimisation.hh +++ b/dune/tectonic/minimisation.hh @@ -6,6 +6,7 @@ #include <dune/common/stdstreams.hh> #include <dune/fufem/interval.hh> +#include <dune/solvers/computeenergy.hh> #include <dune/tnnmg/problem-classes/bisection.hh> #include "mydirectionalconvexfunction.hh" @@ -31,11 +32,8 @@ void descentMinimisation(Functional const &J, J.A.mmv(x, tmp); // b-Au double const JRestb = tmp * v; // <b-Au,v> - J.A.mv(v, tmp); // Av - double const JRestA = tmp * v; // <Av,v> - - MyDirectionalConvexFunction<LocalNonlinearityType> const JRest(JRestA, JRestb, - *J.phi, x, v); + MyDirectionalConvexFunction<LocalNonlinearityType> const JRest( + 2.0 * computeEnergy(J.A, v), JRestb, *J.phi, x, v); // }}} { // Debug