From 2cce2c73538c87ae23e032f4791c3ae551014e2c Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 11 Nov 2011 17:03:52 +0100
Subject: [PATCH] newphi -> phi

---
 dune/tectonic/myblockproblem.hh  | 2 +-
 dune/tectonic/myconvexproblem.hh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index f3a6c50b..243fdd8e 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -115,7 +115,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
       assert(localA != NULL);
 
       FunctionType f;
-      problem.newphi.restriction(m, f);
+      problem.phi.restriction(m, f);
       Dune::LocalNonlinearity<block_size> const phi(f);
       Dune::SampleFunctional<block_size> localJ(*localA, localb, phi,
                                                 ignore_component);
diff --git a/dune/tectonic/myconvexproblem.hh b/dune/tectonic/myconvexproblem.hh
index 27de143f..588aa381 100644
--- a/dune/tectonic/myconvexproblem.hh
+++ b/dune/tectonic/myconvexproblem.hh
@@ -29,12 +29,12 @@ class MyConvexProblem {
       \param u The solution vector
   */
   MyConvexProblem(MatrixType const &A,
-                  Dune::GlobalNonlinearity<block_size, FunctionType> &newphi,
+                  Dune::GlobalNonlinearity<block_size, FunctionType> &phi,
                   VectorType const &f, VectorType &u)
-      : A(A), newphi(newphi), f(f), u(u) {};
+      : A(A), phi(phi), f(f), u(u) {};
 
   MatrixType const &A;
-  Dune::GlobalNonlinearity<block_size, FunctionType> const &newphi;
+  Dune::GlobalNonlinearity<block_size, FunctionType> const &phi;
 
   VectorType const &f;
 
-- 
GitLab