From e75bb7e968fe9e4e1c04709ec13c1888dfb50621 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Nov 2013 14:21:23 +0100 Subject: [PATCH] Changed createTimeStep -> creationTimeStep for readability. --- opm/parser/eclipse/EclipseState/Schedule/Group.cpp | 6 +++--- opm/parser/eclipse/EclipseState/Schedule/Group.hpp | 4 ++-- opm/parser/eclipse/EclipseState/Schedule/Well.cpp | 6 +++--- opm/parser/eclipse/EclipseState/Schedule/Well.hpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index bdaebcce4..b254954cc 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -83,13 +83,13 @@ namespace Opm { /*****************************************************************/ - Group::Group(const std::string& name , TimeMapConstPtr timeMap , size_t createTimeStep) : + Group::Group(const std::string& name , TimeMapConstPtr timeMap , size_t creationTimeStep) : m_injection( new GroupInjection::InjectionData(timeMap) ), m_production( new GroupProduction::ProductionData( timeMap )), m_wells( new DynamicState(timeMap , WellSetConstPtr(new WellSet() ))) { m_name = name; - m_createTimeStep = createTimeStep; + m_creationTimeStep = creationTimeStep; } @@ -99,7 +99,7 @@ namespace Opm { bool Group::hasBeenDefined(size_t timeStep) const { - if (timeStep < m_createTimeStep) + if (timeStep < m_creationTimeStep) return false; else return true; diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp index 275a28d8e..9c531ef08 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp @@ -43,7 +43,7 @@ namespace Opm { class Group { public: - Group(const std::string& name, TimeMapConstPtr timeMap , size_t createTimeStep); + Group(const std::string& name, TimeMapConstPtr timeMap , size_t creationTimeStep); bool hasBeenDefined(size_t timeStep) const; const std::string& name() const; void setInjectionPhase(size_t time_step , PhaseEnum phase); @@ -94,7 +94,7 @@ namespace Opm { private: WellSetConstPtr wellMap(size_t time_step) const; - size_t m_createTimeStep; + size_t m_creationTimeStep; std::string m_name; boost::shared_ptr m_injection; boost::shared_ptr m_production; diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp index 3e261a60a..0ab9a4175 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.cpp @@ -29,7 +29,7 @@ namespace Opm { - Well::Well(const std::string& name , TimeMapConstPtr timeMap , size_t createTimeStep) + Well::Well(const std::string& name , TimeMapConstPtr timeMap , size_t creationTimeStep) : m_oilRate( new DynamicState( timeMap , 0.0)) , m_gasRate(new DynamicState(timeMap, 0.0)), m_waterRate(new DynamicState(timeMap, 0.0)), @@ -40,7 +40,7 @@ namespace Opm { m_groupName( new DynamicState( timeMap , "" )) { m_name = name; - m_createTimeStep = createTimeStep; + m_creationTimeStep = creationTimeStep; } const std::string& Well::name() const { @@ -49,7 +49,7 @@ namespace Opm { bool Well::hasBeenDefined(size_t timeStep) const { - if (timeStep < m_createTimeStep) + if (timeStep < m_creationTimeStep) return false; else return true; diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp index 6668576dd..62ddb2bc9 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp @@ -33,7 +33,7 @@ namespace Opm { class Well { public: - Well(const std::string& name, TimeMapConstPtr timeMap , size_t createTimeStep); + Well(const std::string& name, TimeMapConstPtr timeMap , size_t creationTimeStep); const std::string& name() const; bool hasBeenDefined(size_t timeStep) const; @@ -60,7 +60,7 @@ namespace Opm { void switch2Producer(size_t timeStep ); void switch2Injector(size_t timeStep ); - size_t m_createTimeStep; + size_t m_creationTimeStep; std::string m_name; boost::shared_ptr > m_oilRate; boost::shared_ptr > m_gasRate;