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

Merge pull request #1523 from atgeirr/fix-currentDateTime

Browse Source 
Cast argument for milliseconds() call to an integer.
This commit is contained in:
Tor Harald Sandve 2018-06-28 07:51:53 +02:00 committed by GitHub
commit b1e03d5196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/timestepping/SimulatorTimer.cpp
View File

@ -114,9 +114,11 @@ namespace Opm
boost::posix_time::ptime SimulatorTimer::currentDateTime() const
{
// boost uses only 32 bit long for seconds. But 64 bit for milliseconds
// as a work around for very large timess we just use milliseconds
return startDateTime() + boost::posix_time::milliseconds( simulationTimeElapsed() / Opm::prefix::milli);
// Boost uses only 32 bit long for seconds, but 64 bit for milliseconds.
// As a workaround for very large times we just use milliseconds.
// The cast is necessary because boost::posix_time::milliseconds requires
// an integer argument.
return startDateTime() + boost::posix_time::milliseconds(static_cast<long long>(simulationTimeElapsed() / Opm::prefix::milli));
}
/// Total time.