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

Changed createTimeStep -> creationTimeStep for readability.

Browse Source
This commit is contained in:
Joakim Hove
2013-11-27 14:21:23 +01:00
parent db274060e4
commit e75bb7e968
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/EclipseState/Schedule/Group.cpp
View File

@@ -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<WellSetConstPtr>(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;

4
opm/parser/eclipse/EclipseState/Schedule/Group.hpp
View File

@@ -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<GroupInjection::InjectionData> m_injection;
boost::shared_ptr<GroupProduction::ProductionData> m_production;

6
opm/parser/eclipse/EclipseState/Schedule/Well.cpp
View File

@@ -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<double>( timeMap , 0.0)) ,
m_gasRate(new DynamicState<double>(timeMap, 0.0)),
m_waterRate(new DynamicState<double>(timeMap, 0.0)),
@@ -40,7 +40,7 @@ namespace Opm {
m_groupName( new DynamicState<std::string>( 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;

4
opm/parser/eclipse/EclipseState/Schedule/Well.hpp
View File

@@ -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<DynamicState<double> > m_oilRate;
boost::shared_ptr<DynamicState<double> > m_gasRate;