From fc9958bb0cd03cb0a0130de9e6cdf33c2bd5d712 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 22 Jan 2020 16:56:42 +0100 Subject: [PATCH] Remove TimeMap( start_time ) constructor --- opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp | 1 - src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp | 4 ---- tests/parser/DynamicStateTests.cpp | 6 +++--- tests/parser/DynamicVectorTests.cpp | 2 +- tests/parser/TimeMapTest.cpp | 9 +-------- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp index 15f930cc6..485c026a3 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp @@ -50,7 +50,6 @@ namespace Opm { }; TimeMap() = default; - explicit TimeMap(std::time_t startTime); explicit TimeMap(const Deck& deck); explicit TimeMap(const std::vector& time_points); TimeMap(const std::vector& timeList, diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp index 7c0147fbf..acfa3b16c 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp @@ -49,10 +49,6 @@ namespace { {"DES", 12}}; } - TimeMap::TimeMap(std::time_t startTime) { - m_timeList.push_back(startTime); - } - TimeMap::TimeMap(const std::vector& time_points) { if (time_points.empty()) throw std::invalid_argument("Can not initialize with empty list of time points"); diff --git a/tests/parser/DynamicStateTests.cpp b/tests/parser/DynamicStateTests.cpp index 56bfd026e..6d72fb53d 100644 --- a/tests/parser/DynamicStateTests.cpp +++ b/tests/parser/DynamicStateTests.cpp @@ -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 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 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 state(timeMap , 137); BOOST_CHECK_EQUAL( 137 , state.get(0)); BOOST_CHECK_EQUAL( 137 , state.back() ); diff --git a/tests/parser/DynamicVectorTests.cpp b/tests/parser/DynamicVectorTests.cpp index e13b27f89..a2dd58d2b 100644 --- a/tests/parser/DynamicVectorTests.cpp +++ b/tests/parser/DynamicVectorTests.cpp @@ -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 vector(timeMap , 9.99); BOOST_CHECK_EQUAL( vector[0] , 9.99 ); diff --git a/tests/parser/TimeMapTest.cpp b/tests/parser/TimeMapTest.cpp index 8519805b3..e572d63f9 100644 --- a/tests/parser/TimeMapTest.cpp +++ b/tests/parser/TimeMapTest.cpp @@ -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)); }