From ee37f7c4db0d0f596b22e32484508e44531222bf Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 10 May 2012 15:46:49 +0200
Subject: [PATCH] Cleanup
---
src/one-body-sample.cc | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index adb3d148..55add0c6 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -204,7 +204,6 @@ int main(int argc, char *argv[]) {
*s4_new = s4_old;
SingletonVectorType vonMisesStress;
-
VectorType b4;
auto const nodalIntegrals =
@@ -219,18 +218,21 @@ int main(int argc, char *argv[]) {
std::fstream octave_writer("data", std::fstream::out);
std::fstream coefficient_writer("coefficient", std::fstream::out);
timer.reset();
- auto const timesteps = parset.get<size_t>("timesteps");
- octave_writer << "# name: A" << std::endl << "# type: matrix" << std::endl
- << "# rows: " << timesteps << std::endl << "# columns: 3"
- << std::endl;
- double const h = 1.0 / timesteps;
- auto const &neumannFunction = functions.get("neumannCondition");
- auto const &dirichletFunction = functions.get("dirichletCondition");
+
auto const L = parset.get<double>("boundary.friction.ruina.L");
auto const a = parset.get<double>("boundary.friction.ruina.a");
auto const b = parset.get<double>("boundary.friction.ruina.b");
auto const eta = parset.get<double>("boundary.friction.eta");
auto const mu = parset.get<double>("boundary.friction.mu");
+ auto const timesteps = parset.get<size_t>("timesteps");
+ double const h = 1.0 / timesteps;
+
+ octave_writer << "# name: A" << std::endl << "# type: matrix" << std::endl
+ << "# rows: " << timesteps << std::endl << "# columns: 3"
+ << std::endl;
+
+ auto const &dirichletFunction = functions.get("dirichletCondition");
+ auto const &neumannFunction = functions.get("neumannCondition");
for (size_t run = 1; run <= timesteps; ++run) {
if (parset.get<bool>("printProgress")) {
--
GitLab