From 38c3ca41afb43a20c45bda9702d50cc603db402a Mon Sep 17 00:00:00 2001 From: podlesny <podlesny@zedat.fu-berlin.de> Date: Wed, 6 Oct 2021 14:07:24 +0200 Subject: [PATCH] introduce minTau for adaptive time stepping --- src/multi-body-problem/multi-body-problem.cc | 3 ++- src/multi-body-problem/multi-body-problem.cfg | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/multi-body-problem/multi-body-problem.cc b/src/multi-body-problem/multi-body-problem.cc index b4e40038..da62c6d1 100644 --- a/src/multi-body-problem/multi-body-problem.cc +++ b/src/multi-body-problem/multi-body-problem.cc @@ -362,9 +362,10 @@ int main(int argc, char *argv[]) { timeStepper(stepBase, contactNetwork, current, programState.relativeTime, programState.relativeTau);*/ + const auto minTau = parset.get<double>("initialTime.minRelativeTau"); AdaptiveTimeStepper<NonlinearFactory, std::decay_t<decltype(contactNetwork)>, Updaters, std::decay_t<decltype(stateEnergyNorms)>> timeStepper(stepBase, contactNetwork, current, - programState.relativeTime, programState.relativeTau, + programState.relativeTime, programState.relativeTau, minTau, mustRefine); size_t timeSteps = std::round(parset.get<double>("timeSteps.timeSteps")); diff --git a/src/multi-body-problem/multi-body-problem.cfg b/src/multi-body-problem/multi-body-problem.cfg index a8160fb9..1a20e476 100644 --- a/src/multi-body-problem/multi-body-problem.cfg +++ b/src/multi-body-problem/multi-body-problem.cfg @@ -1,6 +1,6 @@ # -*- mode:conf -*- [general] -outPath = newmark # output written to ./output/outPath +outPath = 5-body # output written to ./output/outPath gravity = 9.81 # [m/s^2] @@ -48,7 +48,7 @@ finalVelocity = 2e-4 # [m/s] timeStep = 0 relativeTime = 0.0 relativeTau = 1e-4 # 1e-6 - +minRelativeTau = 0.0 [timeSteps] scheme = newmark @@ -57,7 +57,7 @@ timeSteps = 1e6 [problem] finalTime = 100 # [s] #1000 -bodyCount = 4 +bodyCount = 5 [io] @@ -66,7 +66,7 @@ printProgress = true restarts.first = 0 restarts.spacing= 50 #20 restarts.write = true #true -vtk.write = true +vtk.write = false [u0.solver] -- GitLab