Use computeEnergy

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