[Cleanup] Make relative times public

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_;

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);