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

Add refDepthDefaulted field to Well class.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2014-08-07 12:34:49 +02:00
parent 069ceaa9b7
commit ad93424b6a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -452,9 +452,10 @@ namespace Opm {
// We change from eclipse's 1 - n, to a 0 - n-1 solution
int headI = record->getItem("HEAD_I")->getInt(0) - 1;
int headJ = record->getItem("HEAD_J")->getInt(0) - 1;
bool refDepthDefaulted = record->getItem("REF_DEPTH")->defaultApplied();
double refDepth = record->getItem("REF_DEPTH")->getSIDouble(0);
Phase::PhaseEnum preferredPhase = Phase::PhaseEnumFromString(record->getItem("PHASE")->getTrimmedString(0));
WellPtr well(new Well(wellName, headI, headJ, refDepth, preferredPhase, m_timeMap , timeStep));
WellPtr well(new Well(wellName, headI, headJ, refDepthDefaulted, refDepth, preferredPhase, m_timeMap , timeStep));
m_wells.insert( wellName , well);
}

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

@ -27,7 +27,8 @@
namespace Opm {
Well::Well(const std::string& name_, int headI, int headJ, double refDepth, Phase::PhaseEnum preferredPhase,
Well::Well(const std::string& name_, int headI, int headJ,
bool refDepthDefaulted, double refDepth, Phase::PhaseEnum preferredPhase,
TimeMapConstPtr timeMap, size_t creationTimeStep)
: m_status(new DynamicState<WellCommon::StatusEnum>(timeMap, WellCommon::OPEN)),
m_isAvailableForGroupControl(new DynamicState<bool>(timeMap, true)),
@ -41,6 +42,7 @@ namespace Opm {
m_groupName( new DynamicState<std::string>( timeMap , "" )),
m_headI(headI),
m_headJ(headJ),
m_refDepthDefaulted(refDepthDefaulted),
m_refDepth(refDepth),
m_preferredPhase(preferredPhase)
{
@ -146,6 +148,10 @@ namespace Opm {
return m_headJ;
}
bool Well::getRefDepthDefaulted() const {
return m_refDepthDefaulted;
}
double Well::getRefDepth() const {
return m_refDepth;
}

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

@ -79,7 +79,9 @@ namespace Opm {
class Well {
public:
Well(const std::string& name, int headI, int headJ, double refDepth, Phase::PhaseEnum preferredPhase,
Well(const std::string& name, int headI, int headJ,
bool refDepthDefaulted, double refDepth,
Phase::PhaseEnum preferredPhase,
TimeMapConstPtr timeMap, size_t creationTimeStep);
const std::string& name() const;
@ -92,6 +94,7 @@ namespace Opm {
int getHeadI() const;
int getHeadJ() const;
bool getRefDepthDefaulted() const;
double getRefDepth() const;
Phase::PhaseEnum getPreferredPhase() const;
@ -138,6 +141,7 @@ namespace Opm {
// WELSPECS data - assumes this is not dynamic
int m_headI;
int m_headJ;
bool m_refDepthDefaulted;
double m_refDepth;
Phase::PhaseEnum m_preferredPhase;
};