From b3dbd6f930d2453889ab4f9a3c61a933bab669f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= <jokva@statoil.com>
Date: Fri, 7 Oct 2016 12:57:26 +0200
Subject: [PATCH] Return const ref from getSchedule

---
 opm/parser/eclipse/EclipseState/EclipseState.cpp            | 4 ++--
 opm/parser/eclipse/EclipseState/EclipseState.hpp            | 2 +-
 .../eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp    | 2 +-
 opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp | 4 ++--
 .../eclipse/IntegrationTests/TransMultIntegrationTests.cpp  | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/opm/parser/eclipse/EclipseState/EclipseState.cpp b/opm/parser/eclipse/EclipseState/EclipseState.cpp
index 656b49275..898e1ca29 100644
--- a/opm/parser/eclipse/EclipseState/EclipseState.cpp
+++ b/opm/parser/eclipse/EclipseState/EclipseState.cpp
@@ -140,8 +140,8 @@ namespace Opm {
         return m_parseContext;
     }
 
-    ScheduleConstPtr EclipseState::getSchedule() const {
-        return m_schedule;
+    const Schedule& EclipseState::getSchedule() const {
+        return *m_schedule;
     }
 
     /// [[deprecated]] --- use cfg().io()
diff --git a/opm/parser/eclipse/EclipseState/EclipseState.hpp b/opm/parser/eclipse/EclipseState/EclipseState.hpp
index 3b17e0677..0e3c10384 100644
--- a/opm/parser/eclipse/EclipseState/EclipseState.hpp
+++ b/opm/parser/eclipse/EclipseState/EclipseState.hpp
@@ -70,7 +70,7 @@ namespace Opm {
 
         const ParseContext& getParseContext() const;
 
-        std::shared_ptr< const Schedule > getSchedule() const;
+        const Schedule& getSchedule() const;
         std::shared_ptr< const IOConfig > getIOConfigConst() const;
         std::shared_ptr< IOConfig > getIOConfig() const;
 
diff --git a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp b/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
index 9d8e46661..10e0ce7a5 100644
--- a/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
+++ b/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
@@ -293,7 +293,7 @@ inline void uniq( std::vector< ERT::smspec_node >& vec ) {
 
 SummaryConfig::SummaryConfig( const Deck& deck, const EclipseState& es , const ParseContext& parseContext)
     : SummaryConfig( deck,
-                        *es.getSchedule(),
+                        es.getSchedule(),
                         es.get3DProperties(),
                         parseContext,
                         dimensions( *es.getInputGrid() ) )
diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
index 9b5012dd1..a054d905c 100644
--- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
+++ b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
@@ -197,10 +197,10 @@ return parser->parseString(deckData, ParseContext()) ;
 BOOST_AUTO_TEST_CASE(CreateSchedule) {
     DeckPtr deck = createDeck();
     EclipseState state(*deck, ParseContext());
-    ScheduleConstPtr schedule = state.getSchedule();
+    const auto& schedule = state.getSchedule();
     EclipseGridConstPtr eclipseGrid = state.getInputGrid();
 
-    BOOST_CHECK_EQUAL(schedule->getStartTime(), boost::posix_time::ptime(boost::gregorian::date(1998, 3, 8)));
+    BOOST_CHECK_EQUAL(schedule.getStartTime(), boost::posix_time::ptime(boost::gregorian::date(1998, 3, 8)));
 }
 
 
diff --git a/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp b/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp
index ceccc38b5..3af9be74f 100644
--- a/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp
+++ b/opm/parser/eclipse/IntegrationTests/TransMultIntegrationTests.cpp
@@ -45,14 +45,14 @@ BOOST_AUTO_TEST_CASE(MULTFLT_IN_SCHEDULE) {
     DeckPtr deck = parser->parseFile(scheduleFile, parseContext);
     EclipseState state(*deck, parseContext);
     const auto& trans = state.getTransMult();
-    std::shared_ptr<const Schedule> schedule = state.getSchedule();
-    const Events& events = schedule->getEvents();
+    const auto& schedule = state.getSchedule();
+    const Events& events = schedule.getEvents();
 
     BOOST_CHECK_EQUAL( 0.10 , trans.getMultiplier( 3,2,0,FaceDir::XPlus ));
     BOOST_CHECK_EQUAL( 0.10 , trans.getMultiplier( 2,2,0,FaceDir::XPlus ));
     BOOST_CHECK( events.hasEvent( ScheduleEvents::GEO_MODIFIER , 3 ) );
     {
-        std::shared_ptr<const Deck> mini_deck = schedule->getModifierDeck(3);
+        std::shared_ptr<const Deck> mini_deck = schedule.getModifierDeck(3);
         state.applyModifierDeck( *mini_deck );
     }
     BOOST_CHECK_EQUAL( 2.00 , trans.getMultiplier( 2,2,0,FaceDir::XPlus ));