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

Remove TimeMap( start_time ) constructor

Browse Source
This commit is contained in:
Joakim Hove
2020-01-22 16:56:42 +01:00
parent 63e99fb807
commit fc9958bb0c
5 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp
View File

@@ -50,7 +50,6 @@ namespace Opm {
};
TimeMap() = default;
explicit TimeMap(std::time_t startTime);
explicit TimeMap(const Deck& deck);
explicit TimeMap(const std::vector<std::time_t>& time_points);
TimeMap(const std::vector<std::time_t>& timeList,

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

@@ -49,10 +49,6 @@ namespace {
{"DES", 12}};
}
TimeMap::TimeMap(std::time_t startTime) {
m_timeList.push_back(startTime);
}
TimeMap::TimeMap(const std::vector<std::time_t>& time_points) {
if (time_points.empty())
throw std::invalid_argument("Can not initialize with empty list of time points");

6
tests/parser/DynamicStateTests.cpp
View File

@@ -43,14 +43,14 @@ Opm::TimeMap make_timemap(int num) {
BOOST_AUTO_TEST_CASE(CreateDynamicTest) {
const std::time_t startDate = Opm::TimeMap::mkdate(2010, 1, 1);
Opm::TimeMap timeMap{ startDate };
Opm::TimeMap timeMap({ startDate });
Opm::DynamicState<double> state(timeMap , 9.99);
}
BOOST_AUTO_TEST_CASE(DynamicStateGetOutOfRangeThrows) {
const std::time_t startDate = Opm::TimeMap::mkdate(2010, 1, 1);
Opm::TimeMap timeMap{ startDate };
Opm::TimeMap timeMap({ startDate });
Opm::DynamicState<double> state(timeMap , 9.99);
BOOST_CHECK_THROW( state.get(1) , std::out_of_range );
}
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(DynamicStateGetOutOfRangeThrows) {
BOOST_AUTO_TEST_CASE(DynamicStateGetDefault) {
const std::time_t startDate = Opm::TimeMap::mkdate(2010, 1, 1);
Opm::TimeMap timeMap{ startDate };
Opm::TimeMap timeMap( { startDate } );
Opm::DynamicState<int> state(timeMap , 137);
BOOST_CHECK_EQUAL( 137 , state.get(0));
BOOST_CHECK_EQUAL( 137 , state.back() );

2
tests/parser/DynamicVectorTests.cpp
View File

@@ -31,7 +31,7 @@
BOOST_AUTO_TEST_CASE(CreateDynamicTest) {
const std::time_t startDate = Opm::TimeMap::mkdate(2010, 1, 1);
Opm::TimeMap timeMap{ startDate };
Opm::TimeMap timeMap({ startDate });
Opm::DynamicVector<double> vector(timeMap , 9.99);
BOOST_CHECK_EQUAL( vector[0] , 9.99 );

9
tests/parser/TimeMapTest.cpp
View File

@@ -40,15 +40,8 @@ const std::time_t startDateJan1st2010 = Opm::TimeMap::mkdate(2010, 1, 1);
Opm::DeckRecord createDeckRecord(int day, const std::string &month, int year, const std::string &time = "00:00:00.000");
BOOST_AUTO_TEST_CASE(CreateTimeMapFromTimeT) {
std::time_t startDate = time(NULL);
Opm::TimeMap timeMap(startDate);
BOOST_CHECK_EQUAL(1U , timeMap.size());
}
BOOST_AUTO_TEST_CASE(GetStartDate) {
Opm::TimeMap timeMap(startDateJan1st2010);
Opm::TimeMap timeMap({ startDateJan1st2010 });
BOOST_CHECK_EQUAL( Opm::TimeMap::mkdate(2010, 1, 1) , timeMap.getStartTime(/*timeStepIdx=*/0));
}