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

remove accessors in MULTREGTScanner added for external serialization

Browse Source 
and make the serialization-friendly getSearchMap() private
This commit is contained in:
Arne Morten Kvarving 2020-03-13 08:20:12 +01:00
parent e4465fc31c
commit ed0ed133a2
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
View File

@ -102,12 +102,6 @@ namespace Opm {
double getRegionMultiplier(size_t globalCellIdx1, size_t globalCellIdx2, FaceDir::DirEnum faceDir) const;
std::array<size_t,3> getSize() const;
const std::vector<MULTREGTRecord>& getRecords() const;
ExternalSearchMap getSearchMap() const;
const std::map<std::string, std::vector<int>>& getRegions() const;
const std::string& getDefaultRegion() const;
bool operator==(const MULTREGTScanner& data) const;
MULTREGTScanner& operator=(const MULTREGTScanner& data);
@ -127,6 +121,7 @@ namespace Opm {
}
private:
ExternalSearchMap getSearchMap() const;
void constructSearchMap(const ExternalSearchMap& searchMap);
void addKeyword( const DeckKeyword& deckKeyword, const std::string& defaultRegion);

26
src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
View File

@ -297,22 +297,6 @@ std::vector<int> unique(const std::vector<int> data) {
return 1;
}
std::array<size_t,3> MULTREGTScanner::getSize() const {
return {nx, ny, nz};
}
const std::vector<MULTREGTRecord>& MULTREGTScanner::getRecords() const {
return m_records;
}
const std::map<std::string, std::vector<int>>& MULTREGTScanner::getRegions() const {
return regions;
}
const std::string& MULTREGTScanner::getDefaultRegion() const {
return default_region;
}
MULTREGTScanner::ExternalSearchMap MULTREGTScanner::getSearchMap() const {
ExternalSearchMap result;
for (const auto& it : m_searchMap) {
@ -341,11 +325,13 @@ std::vector<int> unique(const std::vector<int> data) {
}
bool MULTREGTScanner::operator==(const MULTREGTScanner& data) const {
return this->getSize() == data.getSize() &&
this->getRecords() == data.getRecords() &&
this->getRegions() == data.getRegions() &&
return this->nx == data.nx &&
this->ny == data.ny &&
this->nz == data.nz &&
this->m_records == data.m_records &&
this->regions == data.regions &&
this->getSearchMap() == data.getSearchMap() &&
this->getDefaultRegion() == data.getDefaultRegion();
this->default_region == data.default_region;
}
MULTREGTScanner& MULTREGTScanner::operator=(const MULTREGTScanner& data) {