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:
WellSegments() = default;
std::string wellName() const;
const std::string& wellName() const;
int size() const;
double depthTopSegment() const;
double lengthTopSegment() const;

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

@ -53,8 +53,7 @@ namespace Opm {
const std::size_t seqIndex,
const double segDistStart,
const double segDistEnd,
const bool defaultSatTabId
);
const bool defaultSatTabId);
bool attachedToSegment() const;
@ -88,6 +87,7 @@ namespace Opm {
const double& getSegDistEnd() const;
void setSegDistStart(const double& distStart);
void setSegDistEnd(const double& distEnd);
std::string str() const;
bool operator==( const Connection& ) const;
bool operator!=( const Connection& ) const;

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

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

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

@ -35,7 +35,7 @@
namespace Opm {
std::string WellSegments::wellName() const {
const std::string& WellSegments::wellName() const {
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))
switchToProducer( timeStep );
m_isProducer.update(timeStep , true);
this->setProducer(timeStep, true);
return m_productionProperties.update(timeStep, newProperties);
}
@ -163,7 +163,7 @@ namespace Opm {
if (isProducer(timeStep))
switchToInjector( timeStep );
m_isProducer.update(timeStep , false);
this->setProducer(timeStep, false);
return m_injectionProperties.update(timeStep, newProperties);
}
@ -176,8 +176,8 @@ namespace Opm {
}
bool Well::setPolymerProperties(size_t timeStep , const WellPolymerProperties& newProperties) {
m_isProducer.update(timeStep , false);
bool update = m_polymerProperties.update(timeStep, newProperties);
this->setProducer(timeStep, false);
return update;
}
@ -240,6 +240,10 @@ namespace Opm {
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 {
return bool( m_isProducer.get(timeStep) );
}

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

@ -309,8 +309,7 @@ namespace {
satTableId,
direction,
noConn, 0., 0., defaultSatTable);
}
else {
} else {
std::size_t noConn = prev->getSeqIndex();
// The complnum value carries over; the rest of the state is fully specified by
// the current COMPDAT keyword.

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

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