From b27415d1b28842ba0fd128ff829c7c95179fac72 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 30 Jan 2014 13:51:27 +0100
Subject: [PATCH] [Cleanup] Friction writing: Use a lambda for friction reports
---
src/one-body-sample.cc | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index b0ffa893..5deffbe6 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -282,11 +282,13 @@ int main(int argc, char *argv[]) {
}
FrictionWriter<ScalarVector, Vector> writer(vertexCoordinates,
frictionalNodes);
- {
+ auto const reportFriction = [&](Vector const &_u, Vector const &_v,
+ ScalarVector const &_alpha) {
ScalarVector c;
- myGlobalNonlinearity->coefficientOfFriction(v_initial, c);
- writer.writeInfo(c, alpha_initial, u_initial, v_initial);
- }
+ myGlobalNonlinearity->coefficientOfFriction(_v, c);
+ writer.writeInfo(c, _alpha, _u, _v);
+ };
+ reportFriction(u_initial, v_initial, alpha_initial);
MyVTKWriter<typename MyAssembler::VertexBasis,
typename MyAssembler::CellBasis> const
@@ -419,11 +421,7 @@ int main(int argc, char *argv[]) {
if (printProgress)
std::cout << std::endl;
- {
- ScalarVector c;
- myGlobalNonlinearity->coefficientOfFriction(v, c);
- writer.writeInfo(c, alpha, u, v);
- }
+ reportFriction(u, v, alpha);
iterationWriter << std::endl;
relaxationWriter << std::endl;
--
GitLab