OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #510 from bska/difftime

Browse Source 
TimeMap: Use difftime() for Time Deltas as double
This commit is contained in:
Joakim Hove 2018-10-02 14:44:44 +02:00 committed by GitHub
commit c81e5027c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
View File

@ -85,8 +85,9 @@ namespace Opm {
{
if (m_timeList.size() < 2)
return 0.0;
const time_t deltaT = m_timeList.back() - m_timeList.front();
return static_cast<double>(deltaT);
return std::difftime(this->m_timeList.back(),
this->m_timeList.front());
}
void TimeMap::addTime(std::time_t newTime) {
@ -196,19 +197,17 @@ namespace Opm {
double TimeMap::getTimeStepLength(size_t tStepIdx) const
{
assert(tStepIdx < numTimesteps());
const std::time_t t1 = m_timeList[tStepIdx];
const std::time_t t2 = m_timeList[tStepIdx + 1];
const std::time_t deltaT = t2 - t1;
return static_cast<double>(deltaT);
return std::difftime(this->m_timeList[tStepIdx + 1],
this->m_timeList[tStepIdx + 0]);
}
double TimeMap::getTimePassedUntil(size_t tLevelIdx) const
{
assert(tLevelIdx < m_timeList.size());
const std::time_t t1 = m_timeList.front();
const std::time_t t2 = m_timeList[tLevelIdx];
const std::time_t deltaT = t2 - t1;
return static_cast<double>(deltaT);
return std::difftime(this->m_timeList[tLevelIdx],
this->m_timeList.front());
}