From 7b36189e9a2ee43df06cecf700cca6313e12ae68 Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Thu, 3 Nov 2011 19:11:54 +0100 Subject: [PATCH] f -> b --- src/one-body-sample.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index fddc9712..cfe1c64f 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -180,19 +180,19 @@ int main() { u1 = 0; VectorType u2 = u1; - VectorType f(grid.size(grid.maxLevel(), dim)); + VectorType b(grid.size(grid.maxLevel(), dim)); std::vector<Dune::FieldVector<double, 1>> nodalIntegrals; assemble_frictional<GridType, GridType::LeafGridView, SmallVector, P1Basis>( leafView, p1Basis, frictionalNodes, nodalIntegrals); for (size_t run = 1; run <= runs; ++run) { - // f = neumann + // b = neumann assemble_neumann<GridType, GridType::LeafGridView, SmallVector, P1Basis>( - leafView, p1Basis, neumannNodes, f); + leafView, p1Basis, neumannNodes, b); - // f += linear update - stiffnessMatrix.umv(u1, f); + // b += linear update + stiffnessMatrix.umv(u1, b); // {{{ Assemble terms for the nonlinearity // TODO: Random value @@ -212,7 +212,7 @@ int main() { { MyConvexProblemType myConvexProblem(stiffnessMatrix, - myGlobalNonlinearity, f, u1); + myGlobalNonlinearity, b, u1); MyBlockProblemType myBlockProblem(myConvexProblem); nonlinearGSStep.setProblem(u1, myBlockProblem); @@ -227,7 +227,7 @@ int main() { { // TODO: Why does blockGSStep even provide a default constructor? BlockGSStep<OperatorType, VectorType> blockGSStep(stiffnessMatrix, u2, - f); + b); blockGSStep.ignoreNodes_ = &ignoreNodes; LoopSolver<VectorType> solver(&blockGSStep, solver_maxIterations, -- GitLab