diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 2538ccc5b1500c883d19c59fb55b517d594937ce..46b763bcd4dfd9458bdee1530691c93be080b7a3 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -207,26 +207,26 @@ int main() { assemble_neumann<GridType, GridType::LeafGridView, SmallVector, P1Basis>( grid.leafView(), p1Basis, neumannNodes, f); - { - std::vector<Dune::FieldVector<double, 1>> nodalIntegrals; - assemble_frictional<GridType, GridType::LeafGridView, SmallVector, - P1Basis>(grid.leafView(), p1Basis, frictionalNodes, - nodalIntegrals); + // {{{ Assemble terms for the nonlinearity + std::vector<Dune::FieldVector<double, 1>> nodalIntegrals; + assemble_frictional<GridType, GridType::LeafGridView, SmallVector, P1Basis>( + grid.leafView(), p1Basis, frictionalNodes, nodalIntegrals); - // TODO: populate on S_F - std::vector<double> normalStress; - normalStress.resize(grid.size(grid.maxLevel(), dim)); - std::fill(normalStress.begin(), normalStress.end(), 0.0); + // TODO: populate on S_F + std::vector<double> normalStress; + normalStress.resize(grid.size(grid.maxLevel(), dim)); + std::fill(normalStress.begin(), normalStress.end(), 0.0); - // TODO: populate on S_F - std::vector<double> coefficientOfFriction; - coefficientOfFriction.resize(grid.size(grid.maxLevel(), dim)); - std::fill(coefficientOfFriction.begin(), coefficientOfFriction.end(), - 0.0); + // TODO: populate on S_F + std::vector<double> coefficientOfFriction; + coefficientOfFriction.resize(grid.size(grid.maxLevel(), dim)); + std::fill(coefficientOfFriction.begin(), coefficientOfFriction.end(), 0.0); - Dune::GlobalNonlinearity<dim, Dune::LinearFunction> myGlobalNonlinearity( - coefficientOfFriction, normalStress, nodalIntegrals); + Dune::GlobalNonlinearity<dim, Dune::LinearFunction> myGlobalNonlinearity( + coefficientOfFriction, normalStress, nodalIntegrals); + // }}} + { typedef MyConvexProblem<OperatorType, VectorType, Dune::LinearFunction> MyConvexProblemType;