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

Misc minor changes: whitespace++

Browse Source
This commit is contained in:
Joakim Hove 2019-04-23 07:25:05 +02:00
parent b955ecf6b4
commit fffe259621
8 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.hpp
View File

@ -34,7 +34,7 @@ namespace Opm {
public: public:
WellSegments() = default; WellSegments() = default;
std::string wellName() const; const std::string& wellName() const;
int size() const; int size() const;
double depthTopSegment() const; double depthTopSegment() const;
double lengthTopSegment() const; double lengthTopSegment() const;

38
opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp
View File

@ -50,11 +50,10 @@ namespace Opm {
double skin_factor, double skin_factor,
const int satTableId, const int satTableId,
const WellCompletion::DirectionEnum direction, const WellCompletion::DirectionEnum direction,
const std::size_t seqIndex, const std::size_t seqIndex,
const double segDistStart, const double segDistStart,
const double segDistEnd, const double segDistEnd,
const bool defaultSatTabId const bool defaultSatTabId);
);
bool attachedToSegment() const; bool attachedToSegment() const;
@ -79,15 +78,16 @@ namespace Opm {
void setComplnum(int compnum); void setComplnum(int compnum);
void scaleWellPi(double wellPi); void scaleWellPi(double wellPi);
void updateSegment(int segment_number, double center_depth, std::size_t seqIndex); void updateSegment(int segment_number, double center_depth, std::size_t seqIndex);
const std::size_t& getSeqIndex() const; const std::size_t& getSeqIndex() const;
const bool& getDefaultSatTabId() const; const bool& getDefaultSatTabId() const;
const std::size_t& getCompSegSeqIndex() const; const std::size_t& getCompSegSeqIndex() const;
void setCompSegSeqIndex(std::size_t index); void setCompSegSeqIndex(std::size_t index);
void setDefaultSatTabId(bool id); void setDefaultSatTabId(bool id);
const double& getSegDistStart() const; const double& getSegDistStart() const;
const double& getSegDistEnd() const; const double& getSegDistEnd() const;
void setSegDistStart(const double& distStart); void setSegDistStart(const double& distStart);
void setSegDistEnd(const double& distEnd); void setSegDistEnd(const double& distEnd);
std::string str() const;
bool operator==( const Connection& ) const; bool operator==( const Connection& ) const;
bool operator!=( const Connection& ) const; bool operator!=( const Connection& ) const;
@ -104,11 +104,11 @@ namespace Opm {
double m_skin_factor; double m_skin_factor;
std::array<int,3> ijk; std::array<int,3> ijk;
std::size_t m_seqIndex; std::size_t m_seqIndex;
double m_segDistStart; double m_segDistStart;
double m_segDistEnd; double m_segDistEnd;
bool m_defaultSatTabId; bool m_defaultSatTabId;
std::size_t m_compSeg_seqIndex=0; std::size_t m_compSeg_seqIndex=0;
// related segment number // related segment number
// -1 means the completion is not related to segment // -1 means the completion is not related to segment

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

@ -95,6 +95,7 @@ namespace Opm {
void switchToInjector( size_t timeStep); void switchToInjector( size_t timeStep);
void switchToProducer( size_t timeStep); void switchToProducer( size_t timeStep);
bool setProducer(size_t timeStep, bool producer);
bool isProducer(size_t timeStep) const; bool isProducer(size_t timeStep) const;
bool isInjector(size_t timeStep) const; bool isInjector(size_t timeStep) const;
void addWELSPECS(const DeckRecord& deckRecord); void addWELSPECS(const DeckRecord& deckRecord);

2
src/opm/parser/eclipse/EclipseState/Schedule/MSW/WellSegments.cpp
View File

@ -35,7 +35,7 @@
namespace Opm { namespace Opm {
std::string WellSegments::wellName() const { const std::string& WellSegments::wellName() const {
return m_well_name; return m_well_name;
} }

10
src/opm/parser/eclipse/EclipseState/Schedule/Well/Well.cpp
View File

@ -147,7 +147,7 @@ namespace Opm {
if (isInjector(timeStep)) if (isInjector(timeStep))
switchToProducer( timeStep ); switchToProducer( timeStep );
m_isProducer.update(timeStep , true); this->setProducer(timeStep, true);
return m_productionProperties.update(timeStep, newProperties); return m_productionProperties.update(timeStep, newProperties);
} }
@ -163,7 +163,7 @@ namespace Opm {
if (isProducer(timeStep)) if (isProducer(timeStep))
switchToInjector( timeStep ); switchToInjector( timeStep );
m_isProducer.update(timeStep , false); this->setProducer(timeStep, false);
return m_injectionProperties.update(timeStep, newProperties); return m_injectionProperties.update(timeStep, newProperties);
} }
@ -176,8 +176,8 @@ namespace Opm {
} }
bool Well::setPolymerProperties(size_t timeStep , const WellPolymerProperties& newProperties) { bool Well::setPolymerProperties(size_t timeStep , const WellPolymerProperties& newProperties) {
m_isProducer.update(timeStep , false);
bool update = m_polymerProperties.update(timeStep, newProperties); bool update = m_polymerProperties.update(timeStep, newProperties);
this->setProducer(timeStep, false);
return update; return update;
} }
@ -240,6 +240,10 @@ namespace Opm {
return m_status.update( timeStep , status ); return m_status.update( timeStep , status );
} }
bool Well::setProducer(size_t timeStep, bool producer) {
this->m_isProducer.update(timeStep, producer);
}
bool Well::isProducer(size_t timeStep) const { bool Well::isProducer(size_t timeStep) const {
return bool( m_isProducer.get(timeStep) ); return bool( m_isProducer.get(timeStep) );
} }

107
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.cpp
View File

@ -144,10 +144,10 @@ namespace {
double skin_factor, double skin_factor,
const int satTableId, const int satTableId,
const WellCompletion::DirectionEnum direction, const WellCompletion::DirectionEnum direction,
const std::size_t seqIndex, const std::size_t seqIndex,
const double segDistStart, const double segDistStart,
const double segDistEnd, const double segDistEnd,
const bool defaultSatTabId) const bool defaultSatTabId)
{ {
int conn_i = (i < 0) ? this->headI : i; int conn_i = (i < 0) ? this->headI : i;
int conn_j = (j < 0) ? this->headJ : j; int conn_j = (j < 0) ? this->headJ : j;
@ -167,10 +167,10 @@ namespace {
double skin_factor, double skin_factor,
const int satTableId, const int satTableId,
const WellCompletion::DirectionEnum direction, const WellCompletion::DirectionEnum direction,
const std::size_t seqIndex, const std::size_t seqIndex,
const double segDistStart, const double segDistStart,
const double segDistEnd, const double segDistEnd,
const bool defaultSatTabId) const bool defaultSatTabId)
{ {
int complnum = (this->m_connections.size() + 1); int complnum = (this->m_connections.size() + 1);
this->addConnection(i, this->addConnection(i,
@ -186,10 +186,10 @@ namespace {
skin_factor, skin_factor,
satTableId, satTableId,
direction, direction,
seqIndex, seqIndex,
segDistStart, segDistStart,
segDistEnd, segDistEnd,
defaultSatTabId); defaultSatTabId);
} }
void WellConnections::loadCOMPDAT(const DeckRecord& record, const EclipseGrid& grid, const Eclipse3DProperties& eclipseProperties) { void WellConnections::loadCOMPDAT(const DeckRecord& record, const EclipseGrid& grid, const Eclipse3DProperties& eclipseProperties) {
@ -296,48 +296,47 @@ namespace {
same_ijk ); same_ijk );
// Only add connection for active grid cells // Only add connection for active grid cells
if (grid.cellActive(I, J, k)) { if (grid.cellActive(I, J, k)) {
if (prev == this->m_connections.end()) { if (prev == this->m_connections.end()) {
std::size_t noConn = this->m_connections.size(); std::size_t noConn = this->m_connections.size();
this->addConnection(I,J,k, this->addConnection(I,J,k,
grid.getCellDepth( I,J,k ), grid.getCellDepth( I,J,k ),
state, state,
CF, CF,
Kh, Kh,
rw, rw,
r0, r0,
skin_factor, skin_factor,
satTableId, satTableId,
direction, direction,
noConn, 0., 0., defaultSatTable); noConn, 0., 0., defaultSatTable);
} } else {
else { std::size_t noConn = prev->getSeqIndex();
std::size_t noConn = prev->getSeqIndex(); // The complnum value carries over; the rest of the state is fully specified by
// The complnum value carries over; the rest of the state is fully specified by // the current COMPDAT keyword.
// the current COMPDAT keyword. int complnum = prev->complnum();
int complnum = prev->complnum(); std::size_t css_ind = prev->getCompSegSeqIndex();
std::size_t css_ind = prev->getCompSegSeqIndex(); int conSegNo = prev->segment();
int conSegNo = prev->segment(); std::size_t con_SIndex = prev->getSeqIndex();
std::size_t con_SIndex = prev->getSeqIndex(); double conCDepth = prev->depth();
double conCDepth = prev->depth(); double conSDStart = prev->getSegDistStart();
double conSDStart = prev->getSegDistStart(); double conSDEnd = prev->getSegDistEnd();
double conSDEnd = prev->getSegDistEnd(); *prev = Connection(I,J,k,
*prev = Connection(I,J,k, complnum,
complnum, grid.getCellDepth(I,J,k),
grid.getCellDepth(I,J,k), state,
state, CF,
CF, Kh,
Kh, rw,
rw, r0,
r0, skin_factor,
skin_factor, satTableId,
satTableId, direction,
direction, noConn, conSDStart, conSDEnd, defaultSatTable);
noConn, conSDStart, conSDEnd, defaultSatTable); prev->setCompSegSeqIndex(css_ind);
prev->setCompSegSeqIndex(css_ind); prev->updateSegment(conSegNo, conCDepth, con_SIndex);
prev->updateSegment(conSegNo, conCDepth, con_SIndex); }
} }
} }
}
} }

1
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
View File

@ -236,6 +236,7 @@ namespace Opm {
<< "THPH: " << wp.THPH << ", " << "THPH: " << wp.THPH << ", "
<< "VFP table: " << wp.VFPTableNumber << ", " << "VFP table: " << wp.VFPTableNumber << ", "
<< "ALQ: " << wp.ALQValue << ", " << "ALQ: " << wp.ALQValue << ", "
<< "WHISTCTL: " << wp.whistctl_cmode << ", "
<< "prediction: " << wp.predictionMode << " }"; << "prediction: " << wp.predictionMode << " }";
} }