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

remove accessors in Well added for external serialization

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 14:02:21 +01:00
parent 91bd6edd87
commit 6100e1f572
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -582,10 +582,6 @@ public:
int vfp_table_number() const;
double alq_value() const;
double temperature() const;
const UnitSystem& units() const;
double udqUndefined() const;
bool hasSegments() const;
const WellGuideRate& wellGuideRate() const;
bool operator==(const Well& data) const;
void setInsertIndex(std::size_t index);

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

@@ -1335,29 +1335,13 @@ Well::GuideRateTarget Well::GuideRateTargetFromString( const std::string& string
throw std::invalid_argument("Unknown enum state string: " + stringValue );
}
const Well::WellGuideRate& Well::wellGuideRate() const {
return guide_rate;
}
const UnitSystem& Well::units() const {
return unit_system;
}
double Well::udqUndefined() const {
return udq_undefined;
}
bool Well::hasSegments() const {
return segments != nullptr;
}
bool Well::operator==(const Well& data) const {
if (this->hasSegments() != data.hasSegments()) {
if ((segments && !data.segments) || (!segments && data.segments)) {
return false;
}
if (this->hasSegments() && (this->getSegments() != data.getSegments())) {
if (segments && (this->getSegments() != data.getSegments())) {
return false;
}
@@ -1369,14 +1353,14 @@ bool Well::operator==(const Well& data) const {
this->getHeadJ() == data.getHeadJ() &&
this->getRefDepth() == data.getRefDepth() &&
this->getPreferredPhase() == data.getPreferredPhase() &&
this->units() == data.units() &&
this->udqUndefined() == data.udqUndefined() &&
this->unit_system == data.unit_system &&
this->udq_undefined == data.udq_undefined &&
this->getStatus() == data.getStatus() &&
this->getDrainageRadius() == data.getDrainageRadius() &&
this->getAllowCrossFlow() == data.getAllowCrossFlow() &&
this->getAutomaticShutIn() == data.getAutomaticShutIn() &&
this->isProducer() == data.isProducer() &&
this->wellGuideRate() == data.wellGuideRate() &&
this->guide_rate == data.guide_rate &&
this->getEfficiencyFactor() == data.getEfficiencyFactor() &&
this->getSolventFraction() == data.getSolventFraction() &&
this->getEconLimits() == data.getEconLimits() &&