OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

OPM-218: Fix Flow vs Eclipse restart interval write differences: Added new method to SimulatorTimerInterface

Browse Source
This commit is contained in:
chflo 2015-07-27 13:25:33 +02:00
parent 9f721bbe9a
commit d0af851f8e
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
opm/simulators/timestepping/SimulatorTimerInterface.hpp
View File

@ -75,6 +75,11 @@ namespace Opm
/// beginning of the current time step [s]. /// beginning of the current time step [s].
virtual double simulationTimeElapsed() const = 0; virtual double simulationTimeElapsed() const = 0;
/// Time elapsed since the start of the simulation until the
/// beginning of the current time step [s].
virtual double simulationStartTimeForCurrentReportStep() const { return simulationTimeElapsed(); }
/// advance time by currentStepLength /// advance time by currentStepLength
virtual void advance() = 0 ; virtual void advance() = 0 ;
@ -91,6 +96,12 @@ namespace Opm
//boost::posix_time::ptime(startDate()) + boost::posix_time::seconds( (int) simulationTimeElapsed()); //boost::posix_time::ptime(startDate()) + boost::posix_time::seconds( (int) simulationTimeElapsed());
} }
/// Return start time for current report step as a posix time object.
virtual boost::posix_time::ptime currentStepStartTime() const
{
return startDateTime() + boost::posix_time::seconds( (int) simulationStartTimeForCurrentReportStep());
}
/// Time elapsed since the start of the POSIX epoch (Jan 1st, /// Time elapsed since the start of the POSIX epoch (Jan 1st,
/// 1970) until the current time step begins [s]. /// 1970) until the current time step begins [s].
virtual time_t currentPosixTime() const virtual time_t currentPosixTime() const
@ -98,6 +109,20 @@ namespace Opm
tm t = boost::posix_time::to_tm(currentDateTime()); tm t = boost::posix_time::to_tm(currentDateTime());
return std::mktime(&t); return std::mktime(&t);
} }
/// Time elapsed since the start of the POSIX epoch (Jan 1st,
/// 1970) until the current time step begins [s].
/// This method might give different results from currentPosixTime()
/// if timer contains supstepping.
/// Override method simulationStartTimeForCurrentReportStep() if timer
/// contains substeps and currentPosixTime() and startOfCurrentStepPosixTime()
/// can differ due to substepping
virtual time_t startOfCurrentStepPosixTime() const
{
tm t = boost::posix_time::to_tm(currentStepStartTime());
return std::mktime(&t);
}
}; };