newphi -> phi

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);

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;