From 5eeb7f13711fc02a4845e159450f73e8d42a7adb Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 11 Feb 2015 17:59:29 +0100
Subject: [PATCH] [Cleanup] Make relative times public
---
src/adaptivetimestepper.hh | 10 ++++------
src/sand-wedge.cc | 4 ++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/adaptivetimestepper.hh b/src/adaptivetimestepper.hh
index 2636cc1e..c8b9a029 100644
--- a/src/adaptivetimestepper.hh
+++ b/src/adaptivetimestepper.hh
@@ -16,9 +16,9 @@ class AdaptiveTimeStepper {
std::function<void(double, Vector &)> externalForces,
ErrorNorm const &errorNorm,
std::function<bool(Updaters &, Updaters &)> mustRefine)
- : finalTime_(parset.get<double>("problem.finalTime")),
- relativeTime_(relativeTime),
+ : relativeTime_(relativeTime),
relativeTau_(relativeTau),
+ finalTime_(parset.get<double>("problem.finalTime")),
factory_(factory),
parset_(parset),
globalFriction_(globalFriction),
@@ -109,8 +109,8 @@ class AdaptiveTimeStepper {
relativeTime_ += relativeTau_;
}
- double getRelativeTime() { return relativeTime_; }
- double getRelativeTau() { return relativeTau_; }
+ double relativeTime_;
+ double relativeTau_;
private:
void stepAndReport(std::string type, MyCoupledTimeStepper &stepper,
@@ -120,8 +120,6 @@ class AdaptiveTimeStepper {
}
double finalTime_;
- double relativeTime_;
- double relativeTau_;
Factory &factory_;
Dune::ParameterTree const &parset_;
std::shared_ptr<Nonlinearity> globalFriction_;
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 6c7588e8..47dff61d 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -327,8 +327,8 @@ int main(int argc, char *argv[]) {
adaptiveTimeStepper.advance();
- programState.relativeTime = adaptiveTimeStepper.getRelativeTime();
- programState.relativeTau = adaptiveTimeStepper.getRelativeTau();
+ programState.relativeTime = adaptiveTimeStepper.relativeTime_;
+ programState.relativeTau = adaptiveTimeStepper.relativeTau_;
current.rate_->extractDisplacement(programState.u);
current.rate_->extractVelocity(programState.v);
current.rate_->extractAcceleration(programState.a);
--
GitLab