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

[Cleanup] Friction writing: Use a lambda for friction reports

parent 109919ad
No related branches found
No related tags found
No related merge requests found
...@@ -282,11 +282,13 @@ int main(int argc, char *argv[]) { ...@@ -282,11 +282,13 @@ int main(int argc, char *argv[]) {
} }
FrictionWriter<ScalarVector, Vector> writer(vertexCoordinates, FrictionWriter<ScalarVector, Vector> writer(vertexCoordinates,
frictionalNodes); frictionalNodes);
{ auto const reportFriction = [&](Vector const &_u, Vector const &_v,
ScalarVector const &_alpha) {
ScalarVector c; ScalarVector c;
myGlobalNonlinearity->coefficientOfFriction(v_initial, c); myGlobalNonlinearity->coefficientOfFriction(_v, c);
writer.writeInfo(c, alpha_initial, u_initial, v_initial); writer.writeInfo(c, _alpha, _u, _v);
} };
reportFriction(u_initial, v_initial, alpha_initial);
MyVTKWriter<typename MyAssembler::VertexBasis, MyVTKWriter<typename MyAssembler::VertexBasis,
typename MyAssembler::CellBasis> const typename MyAssembler::CellBasis> const
...@@ -419,11 +421,7 @@ int main(int argc, char *argv[]) { ...@@ -419,11 +421,7 @@ int main(int argc, char *argv[]) {
if (printProgress) if (printProgress)
std::cout << std::endl; std::cout << std::endl;
{ reportFriction(u, v, alpha);
ScalarVector c;
myGlobalNonlinearity->coefficientOfFriction(v, c);
writer.writeInfo(c, alpha, u, v);
}
iterationWriter << std::endl; iterationWriter << std::endl;
relaxationWriter << std::endl; relaxationWriter << std::endl;
......
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