From 9f14a1e9a3620c18fed15e78edc0312f6ddbe307 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 28 Jun 2013 12:18:13 +0200
Subject: [PATCH] Use computeEnergy
---
dune/tectonic/minimisation.hh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dune/tectonic/minimisation.hh b/dune/tectonic/minimisation.hh
index 37475bd9..7cf815b7 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
--
GitLab