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

remove accessors in RFTConfig added for external serialization

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 14:02:21 +01:00
parent 276a65f232
commit 19df064ce3
2 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp
View File

@@ -51,12 +51,6 @@ public:
static std::string PLT2String(PLT enumValue);
static PLT PLTFromString( const std::string& stringValue);
using RFTMap = std::unordered_map<std::string,
DynamicState<std::pair<RFT, std::size_t>>>;
using PLTMap = std::unordered_map<std::string,
DynamicState<std::pair<PLT, std::size_t>>>;
template <typename Value>
using ConfigMap = std::unordered_map<
std::string, DynamicState<std::pair<Value, std::size_t>>
@@ -70,8 +64,8 @@ public:
const std::pair<bool, std::size_t>& rftTime,
const WellOpenTimeMap& rftName,
const WellOpenTimeMap& wellOpen,
const RFTMap& rconfig,
const PLTMap& pconfig);
const ConfigMap<RFT>& rconfig,
const ConfigMap<PLT>& pconfig);
explicit RFTConfig(const TimeMap& time_map);
bool rft(const std::string& well, std::size_t report_step) const;
@@ -87,11 +81,6 @@ public:
void addWellOpen(const std::string& well, std::size_t report_step);
const TimeMap& timeMap() const;
const std::pair<bool, std::size_t>& wellOpenRftTime() const;
const WellOpenTimeMap& wellOpenRftName() const;
const WellOpenTimeMap& wellOpen() const;
const RFTMap& rftConfig() const;
const PLTMap& pltConfig() const;
bool operator==(const RFTConfig& data) const;
@@ -113,8 +102,8 @@ private:
std::pair<bool, std::size_t> well_open_rft_time;
WellOpenTimeMap well_open_rft_name;
WellOpenTimeMap well_open;
RFTMap rft_config;
PLTMap plt_config;
ConfigMap<RFT> rft_config;
ConfigMap<PLT> plt_config;
bool outputRftAtWellopen(WellOpenTimeMap::const_iterator well, const std::size_t report_step) const;
std::size_t firstWellopenStepNotBefore(const std::size_t report_step) const;

36
src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp
View File

@@ -37,7 +37,7 @@ RFTConfig::RFTConfig(const TimeMap& tmap,
const std::pair<bool, std::size_t>& rftTime,
const WellOpenTimeMap& rftName,
const WellOpenTimeMap& wellOpen,
const RFTMap& rconfig, const PLTMap& pconfig)
const ConfigMap<RFT>& rconfig, const ConfigMap<PLT>& pconfig)
: tm(tmap)
, first_rft_event(first_rft)
, well_open_rft_time(rftTime)
@@ -266,34 +266,14 @@ const TimeMap& RFTConfig::timeMap() const {
return tm;
}
const std::pair<bool, std::size_t>& RFTConfig::wellOpenRftTime() const {
return well_open_rft_time;
}
const RFTConfig::WellOpenTimeMap& RFTConfig::wellOpenRftName() const {
return well_open_rft_name;
}
const RFTConfig::WellOpenTimeMap& RFTConfig::wellOpen() const {
return well_open;
}
const RFTConfig::RFTMap& RFTConfig::rftConfig() const {
return rft_config;
}
const RFTConfig::PLTMap& RFTConfig::pltConfig() const {
return plt_config;
}
bool RFTConfig::operator==(const RFTConfig& data) const {
return this->timeMap() == data.timeMap() &&
this->firstRFTOutput() == data.firstRFTOutput() &&
this->wellOpenRftTime() == data.wellOpenRftTime() &&
this->wellOpenRftName() == data.wellOpenRftName() &&
this->wellOpen() == data.wellOpen() &&
this->rftConfig() == data.rftConfig() &&
this->pltConfig() == data.pltConfig();
return this->tm == data.tm &&
this->first_rft_event == data.first_rft_event &&
this->well_open_rft_time == data.well_open_rft_time &&
this->well_open_rft_name == data.well_open_rft_name &&
this->well_open == data.well_open &&
this->rft_config == data.rft_config &&
this->plt_config == data.plt_config;
}
bool RFTConfig::outputRftAtWellopen(WellOpenTimeMap::const_iterator well_iter, const std::size_t report_step) const {