Output correct information for temporary use.

Change the SimulatorTimer class a little bit to output the totaltime and
current time correctly.
This commit is contained in:
Kai Bao 2014-03-24 16:41:02 +01:00
parent f2e9016bd0
commit 54316c19c8

View File

@ -102,7 +102,7 @@ namespace Opm
/// Current step number. /// Current step number.
int SimulatorTimer::currentStepNum() const int SimulatorTimer::currentStepNum() const
{ {
return current_step_; return current_step_ + beginReportStepIdx_;
} }
/// Set current step number. /// Set current step number.
@ -143,8 +143,7 @@ namespace Opm
{ {
if (timeMap_) if (timeMap_)
return return
timeMap_->getTimePassedUntil(beginReportStepIdx_ + current_step_) timeMap_->getTimePassedUntil(beginReportStepIdx_ + current_step_);
- timeMap_->getTimePassedUntil(beginReportStepIdx_);
else else
return current_time_; return current_time_;
} }
@ -171,8 +170,7 @@ namespace Opm
{ {
if (timeMap_) if (timeMap_)
return return
timeMap_->getTimePassedUntil(endReportStepIdx_) - timeMap_->getTotalTime();
timeMap_->getTimePassedUntil(beginReportStepIdx_);
else else
return total_time_; return total_time_;
} }