Skip to content
Snippets Groups Projects
Commit 2cce2c73 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

newphi -> phi

parent 240054ac
Branches
No related tags found
No related merge requests found
...@@ -115,7 +115,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject { ...@@ -115,7 +115,7 @@ class MyBlockProblem<MyConvexProblemTypeTEMPLATE>::IterateObject {
assert(localA != NULL); assert(localA != NULL);
FunctionType f; FunctionType f;
problem.newphi.restriction(m, f); problem.phi.restriction(m, f);
Dune::LocalNonlinearity<block_size> const phi(f); Dune::LocalNonlinearity<block_size> const phi(f);
Dune::SampleFunctional<block_size> localJ(*localA, localb, phi, Dune::SampleFunctional<block_size> localJ(*localA, localb, phi,
ignore_component); ignore_component);
......
...@@ -29,12 +29,12 @@ class MyConvexProblem { ...@@ -29,12 +29,12 @@ class MyConvexProblem {
\param u The solution vector \param u The solution vector
*/ */
MyConvexProblem(MatrixType const &A, MyConvexProblem(MatrixType const &A,
Dune::GlobalNonlinearity<block_size, FunctionType> &newphi, Dune::GlobalNonlinearity<block_size, FunctionType> &phi,
VectorType const &f, VectorType &u) VectorType const &f, VectorType &u)
: A(A), newphi(newphi), f(f), u(u) {}; : A(A), phi(phi), f(f), u(u) {};
MatrixType const &A; MatrixType const &A;
Dune::GlobalNonlinearity<block_size, FunctionType> const &newphi; Dune::GlobalNonlinearity<block_size, FunctionType> const &phi;
VectorType const &f; VectorType const &f;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment