OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-03 21:40:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverse changes that should not have been merged into master

Browse Source
This commit is contained in:
chflo 2015-08-10 14:17:59 +02:00
parent b94d5a135d
commit b3b0b427ab
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
View File

@ -112,8 +112,6 @@ namespace Opm
double AdaptiveSimulatorTimer::simulationTimeElapsed() const { return current_time_; }
double AdaptiveSimulatorTimer::simulationStartTimeForCurrentReportStep() const { return start_time_; }
bool AdaptiveSimulatorTimer::done () const { return (current_time_ >= total_time_) ; }
double AdaptiveSimulatorTimer::averageStepLength() const

4
opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
View File

@ -71,10 +71,6 @@ namespace Opm
/// \brief \copydoc SimulationTimer::simulationTimeElapsed
double simulationTimeElapsed() const;
/// \brief \copydoc SimulationTimer::simulationStartTimeForCurrentReportStep
double simulationStartTimeForCurrentReportStep() const;
/// \brief \copydoc SimulationTimer::done
bool done () const;

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

@ -75,11 +75,6 @@ namespace Opm
/// beginning of the current time step [s].
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
virtual void advance() = 0 ;
@ -96,12 +91,6 @@ namespace Opm
//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,
/// 1970) until the current time step begins [s].
virtual time_t currentPosixTime() const
@ -109,20 +98,6 @@ namespace Opm
tm t = boost::posix_time::to_tm(currentDateTime());
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);
}
};