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

Whitespace / comments / move block

parent 1bd431b1
No related branches found
No related tags found
No related merge requests found
...@@ -207,11 +207,10 @@ int main() { ...@@ -207,11 +207,10 @@ int main() {
assemble_neumann<GridType, GridType::LeafGridView, SmallVector, P1Basis>( assemble_neumann<GridType, GridType::LeafGridView, SmallVector, P1Basis>(
grid.leafView(), p1Basis, neumannNodes, f); grid.leafView(), p1Basis, neumannNodes, f);
{ // {{{ Assemble terms for the nonlinearity
std::vector<Dune::FieldVector<double, 1>> nodalIntegrals; std::vector<Dune::FieldVector<double, 1>> nodalIntegrals;
assemble_frictional<GridType, GridType::LeafGridView, SmallVector, assemble_frictional<GridType, GridType::LeafGridView, SmallVector, P1Basis>(
P1Basis>(grid.leafView(), p1Basis, frictionalNodes, grid.leafView(), p1Basis, frictionalNodes, nodalIntegrals);
nodalIntegrals);
// TODO: populate on S_F // TODO: populate on S_F
std::vector<double> normalStress; std::vector<double> normalStress;
...@@ -221,12 +220,13 @@ int main() { ...@@ -221,12 +220,13 @@ int main() {
// TODO: populate on S_F // TODO: populate on S_F
std::vector<double> coefficientOfFriction; std::vector<double> coefficientOfFriction;
coefficientOfFriction.resize(grid.size(grid.maxLevel(), dim)); coefficientOfFriction.resize(grid.size(grid.maxLevel(), dim));
std::fill(coefficientOfFriction.begin(), coefficientOfFriction.end(), std::fill(coefficientOfFriction.begin(), coefficientOfFriction.end(), 0.0);
0.0);
Dune::GlobalNonlinearity<dim, Dune::LinearFunction> myGlobalNonlinearity( Dune::GlobalNonlinearity<dim, Dune::LinearFunction> myGlobalNonlinearity(
coefficientOfFriction, normalStress, nodalIntegrals); coefficientOfFriction, normalStress, nodalIntegrals);
// }}}
{
typedef MyConvexProblem<OperatorType, VectorType, Dune::LinearFunction> typedef MyConvexProblem<OperatorType, VectorType, Dune::LinearFunction>
MyConvexProblemType; MyConvexProblemType;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment