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

Changed from boost datetim to std::time_t.

Browse Source
This commit is contained in:
Joakim Hove
2017-06-19 09:45:43 +02:00
parent f299984280
commit e802737ec4
8 changed files with 84 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
tests/parser/TimeMapTest.cpp
View File

@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(GetStartDate) {
boost::gregorian::date startDate( 2010 , boost::gregorian::Jan , 1);
boost::posix_time::ptime startTime(startDate);
Opm::TimeMap timeMap(startTime);
BOOST_CHECK_EQUAL( startTime , timeMap.getStartTime(/*timeStepIdx=*/0));
BOOST_CHECK_EQUAL( Opm::TimeMap::mkdate(2010, 1, 1) , timeMap.getStartTime(/*timeStepIdx=*/0));
}
@@ -214,68 +214,70 @@ BOOST_AUTO_TEST_CASE( addTSTEPFromWrongKeywordThrows ) {
BOOST_CHECK_THROW( timeMap.addFromTSTEPKeyword( deckKeyword ) , std::invalid_argument );
}
BOOST_AUTO_TEST_CASE(TimeStepsCorrect) {
const char *deckData =
"START\n"
" 21 MAY 1981 /\n"
"\n"
"TSTEP\n"
" 1 2 3 4 5 /\n"
"\n"
"DATES\n"
" 1 JAN 1982 /\n"
" 1 JAN 1982 13:55:44 /\n"
" 3 JAN 1982 14:56:45.123 /\n"
"/\n"
"\n"
"TSTEP\n"
" 6 7 /\n";
Opm::Parser parser( true );
auto deck = parser.parseString(deckData, Opm::ParseContext());
Opm::TimeMap tmap(deck);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/0),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/0), 1*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/1), 1.0*24*60*60);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/1),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
boost::posix_time::time_duration(1*24, 0, 0)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/1), 2*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/2), (1.0 + 2.0)*24*60*60);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/2),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
boost::posix_time::time_duration((1 + 2)*24, 0, 0)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/2), 3*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/3), (1.0 + 2.0 + 3.0)*24*60*60);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/3),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
boost::posix_time::time_duration((1 + 2 + 3)*24, 0, 0)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/3), 4*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/4), (1.0 + 2.0 + 3.0 + 4.0)*24*60*60);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/4),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
boost::posix_time::time_duration((1 + 2 + 3 + 4)*24, 0, 0)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/4), 5*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/5), (1.0 + 2.0 + 3.0 + 4.0 + 5.0)*24*60*60);
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/5),
boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
boost::posix_time::time_duration((1 + 2 + 3 + 4 + 5)*24, 0, 0)));
// timestep 5 is the period between the last step specified using
// of the TIMES keyword and the first record of DATES
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/6),
boost::posix_time::ptime(boost::gregorian::date(1982, 1, 1)));
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/7),
boost::posix_time::ptime(boost::gregorian::date(1982, 1, 1),
boost::posix_time::time_duration(13, 55, 44)));
BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/8),
boost::posix_time::ptime(boost::gregorian::date(1982, 1, 3),
boost::posix_time::time_duration(14, 56, 45) +
boost::posix_time::milliseconds(123)));
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/8), 6*24*60*60);
BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/9), 7*24*60*60);
}
//BOOST_AUTO_TEST_CASE(TimeStepsCorrect) {
// const char *deckData =
// "START\n"
// " 21 MAY 1981 /\n"
// "\n"
// "TSTEP\n"
// " 1 2 3 4 5 /\n"
// "\n"
// "DATES\n"
// " 1 JAN 1982 /\n"
// " 1 JAN 1982 13:55:44 /\n"
// " 3 JAN 1982 14:56:45.123 /\n"
// "/\n"
// "\n"
// "TSTEP\n"
// " 6 7 /\n";
//
// Opm::Parser parser( true );
// auto deck = parser.parseString(deckData, Opm::ParseContext());
// Opm::TimeMap tmap(deck);
//
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/0),
// boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21)));
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/0), 1*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/1), 1.0*24*60*60);
//
//
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/1),
// TimeMap::mkdate( 1981 , 5 , 21 ) + boost::posix_time::time_duration(1*24, 0, 0));
//
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/1), 2*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/2), (1.0 + 2.0)*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/2),
// boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
// boost::posix_time::time_duration((1 + 2)*24, 0, 0)));
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/2), 3*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/3), (1.0 + 2.0 + 3.0)*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/3),
// boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
// boost::posix_time::time_duration((1 + 2 + 3)*24, 0, 0)));
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/3), 4*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/4), (1.0 + 2.0 + 3.0 + 4.0)*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/4),
// boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
// boost::posix_time::time_duration((1 + 2 + 3 + 4)*24, 0, 0)));
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/4), 5*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimePassedUntil(/*timeLevelIdx=*/5), (1.0 + 2.0 + 3.0 + 4.0 + 5.0)*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIdx=*/5),
// boost::posix_time::ptime(boost::gregorian::date(1981, 5, 21),
// boost::posix_time::time_duration((1 + 2 + 3 + 4 + 5)*24, 0, 0)));
// // timestep 5 is the period between the last step specified using
// // of the TIMES keyword and the first record of DATES
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/6),
// boost::posix_time::ptime(boost::gregorian::date(1982, 1, 1)));
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/7),
// boost::posix_time::ptime(boost::gregorian::date(1982, 1, 1),
// boost::posix_time::time_duration(13, 55, 44)));
// BOOST_CHECK_EQUAL(tmap.getStartTime(/*timeLevelIndex=*/8),
// boost::posix_time::ptime(boost::gregorian::date(1982, 1, 3),
// boost::posix_time::time_duration(14, 56, 45) +
// boost::posix_time::milliseconds(123)));
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/8), 6*24*60*60);
// BOOST_CHECK_EQUAL(tmap.getTimeStepLength(/*index=*/9), 7*24*60*60);
//}
BOOST_AUTO_TEST_CASE(initTimestepsYearsAndMonths) {