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

[Cleanup] Rename: myConvexProblem -> convexProblem

parent d56434e2
No related branches found
No related tags found
No related merge requests found
...@@ -367,10 +367,10 @@ int main(int argc, char *argv[]) { ...@@ -367,10 +367,10 @@ int main(int argc, char *argv[]) {
displacementDirichletNodes); displacementDirichletNodes);
auto multigridStep = displacementFactory.getSolver(); auto multigridStep = displacementFactory.getSolver();
typename LinearFactoryType::ConvexProblemType myConvexProblem( typename LinearFactoryType::ConvexProblemType convexProblem(
1.0, A, zeroNonlinearity, ell, u_initial); 1.0, A, zeroNonlinearity, ell, u_initial);
typename LinearFactoryType::BlockProblemType initialDisplacementProblem( typename LinearFactoryType::BlockProblemType initialDisplacementProblem(
parset, myConvexProblem); parset, convexProblem);
auto const &localParset = parset.sub("u0.solver"); auto const &localParset = parset.sub("u0.solver");
multigridStep->setProblem(u_initial, initialDisplacementProblem); multigridStep->setProblem(u_initial, initialDisplacementProblem);
...@@ -417,10 +417,10 @@ int main(int argc, char *argv[]) { ...@@ -417,10 +417,10 @@ int main(int argc, char *argv[]) {
accelerationDirichletNodes); accelerationDirichletNodes);
auto multigridStep = accelerationFactory.getSolver(); auto multigridStep = accelerationFactory.getSolver();
typename LinearFactoryType::ConvexProblemType myConvexProblem( typename LinearFactoryType::ConvexProblemType convexProblem(
1.0, M, zeroNonlinearity, accelerationRHS, a_initial); 1.0, M, zeroNonlinearity, accelerationRHS, a_initial);
typename LinearFactoryType::BlockProblemType initialAccelerationProblem( typename LinearFactoryType::BlockProblemType initialAccelerationProblem(
parset, myConvexProblem); parset, convexProblem);
auto const &localParset = parset.sub("a0.solver"); auto const &localParset = parset.sub("a0.solver");
multigridStep->setProblem(a_initial, initialAccelerationProblem); multigridStep->setProblem(a_initial, initialAccelerationProblem);
...@@ -509,11 +509,11 @@ int main(int argc, char *argv[]) { ...@@ -509,11 +509,11 @@ int main(int argc, char *argv[]) {
myGlobalNonlinearity->updateState(_alpha); myGlobalNonlinearity->updateState(_alpha);
// NIT: Do we really need to pass u here? // NIT: Do we really need to pass u here?
typename NonlinearFactoryType::ConvexProblemType const myConvexProblem( typename NonlinearFactoryType::ConvexProblemType const convexProblem(
1.0, velocityMatrix, *myGlobalNonlinearity, velocityRHS, 1.0, velocityMatrix, *myGlobalNonlinearity, velocityRHS,
_velocityIterate); _velocityIterate);
typename NonlinearFactoryType::BlockProblemType velocityProblem( typename NonlinearFactoryType::BlockProblemType velocityProblem(
parset, myConvexProblem); parset, convexProblem);
multigridStep->setProblem(_velocityIterate, velocityProblem); multigridStep->setProblem(_velocityIterate, velocityProblem);
velocityProblemSolver.preprocess(); velocityProblemSolver.preprocess();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment