From f8b446d4d9334767a8073c976f1163403f5d7f7e Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 6 May 2014 15:09:43 +0200
Subject: [PATCH] [Extern] Adjust to dune-tnnmg changes
---
dune/tectonic/myblockproblem.hh | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index d19db04f..5565d7fd 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -7,11 +7,9 @@
#include <dune/common/nullptr.hh>
#include <dune/common/parametertree.hh>
-// Just for debugging
-#include "dune/solvers/computeenergy.hh"
-
#include <dune/fufem/arithmetic.hh>
#include <dune/solvers/common/interval.hh>
+#include <dune/solvers/computeenergy.hh>
#include <dune/tnnmg/problem-classes/bisection.hh>
#include "globalnonlinearity.hh"
@@ -19,13 +17,6 @@
#include "mydirectionalconvexfunction.hh"
#include "ellipticenergy.hh"
-/* Just for debugging */
-template <class Matrix, class Vector>
-double computeEnergy(Matrix const &A, Vector const &x, Vector const &b,
- GlobalNonlinearity<Matrix, Vector> const &phi) {
- return computeEnergy(A, x, b) + phi(x);
-}
-
/** \brief Base class for problems where each block can be solved with a
* modified gradient method */
template <class ConvexProblem> class MyBlockProblem {
@@ -73,6 +64,11 @@ template <class ConvexProblem> class MyBlockProblem {
return s;
}
+ double computeEnergy(const VectorType &v) const {
+ return 0.0; // FIXME
+ // return ::computeEnergy(problem_.A, v, problem_.f) + problem_.phi(v);
+ }
+
void projectCoarseCorrection(VectorType const &u,
typename Linearization::VectorType const &v,
VectorType &projected_v,
--
GitLab