From ed0ed133a2bf6e0b551e336c2ef8d54f1ffc5692 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 13 Mar 2020 08:20:12 +0100
Subject: [PATCH] remove accessors in MULTREGTScanner added for external
 serialization

and make the serialization-friendly getSearchMap() private
---
 .../EclipseState/Grid/MULTREGTScanner.hpp     |  7 +----
 .../EclipseState/Grid/MULTREGTScanner.cpp     | 26 +++++--------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
index 2d16bb768..c314fcd3a 100644
--- a/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
+++ b/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
@@ -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);
diff --git a/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp b/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
index 0a4fca41a..e7abe2d16 100644
--- a/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
+++ b/src/opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.cpp
@@ -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) {