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

f -> b

parent 1965b420
No related branches found
No related tags found
No related merge requests found
......@@ -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,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment