From 5fef5301e72a9a29d175f6f51333ee8bef3cc2c9 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 21 Jul 2013 14:55:03 +0200
Subject: [PATCH] [Cleanup] Group timestepping parameters in the parset
---
src/one-body-sample.cc | 6 +++---
src/one-body-sample.parset | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index ebfd04eb..1b3c9ab9 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -462,15 +462,15 @@ int main(int argc, char *argv[]) {
std::fstream dampingWriter("damping", std::fstream::out);
auto timeSteppingScheme =
- initTimeStepper(parset.get<Config::scheme>("timeSteppingScheme"),
+ initTimeStepper(parset.get<Config::scheme>("timeSteps.scheme"),
velocityDirichletFunction, velocityDirichletNodes, M, A,
u_initial, v_initial, a_initial);
auto stateUpdater = initStateUpdater<SingletonVectorType, VectorType>(
parset.get<Config::stateModel>("boundary.friction.stateModel"),
alpha_initial, frictionalNodes, frictionData);
- auto const timesteps = parset.get<size_t>("timeSteps");
- auto const tau = parset.get<double>("endOfTime") / timesteps;
+ auto const timesteps = parset.get<size_t>("timeSteps.number");
+ auto const tau = parset.get<double>("problem.endOfTime") / timesteps;
VectorType v = v_initial;
SingletonVectorType alpha = alpha_initial;
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 725462d0..f8343390 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -1,8 +1,10 @@
# -*- mode:conf -*-
-timeSteps = 10000
+[problem]
endOfTime = 15
-timeSteppingScheme = newmark
+[timeSteps]
+number = 10000
+scheme = newmark
[io]
verbosity = quiet
--
GitLab