From f74aa2db0720f4ae3afea7fe92ba51d1f1beb754 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 13 Mar 2020 08:20:12 +0100 Subject: [PATCH] remove accessors in TransMult added for external serialization --- .../eclipse/EclipseState/Grid/TransMult.hpp | 5 ---- .../eclipse/EclipseState/Grid/TransMult.cpp | 26 +++++-------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp b/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp index 6ba859562..ec2a2511d 100644 --- a/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/TransMult.hpp @@ -61,11 +61,6 @@ namespace Opm { void applyMULTFLT(const FaultCollection& faults); void applyMULTFLT(const Fault& fault); - std::array getSize() const; - const std::map>& getTrans() const; - const std::map& getNames() const; - const MULTREGTScanner& getScanner() const; - bool operator==(const TransMult& data) const; template diff --git a/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp b/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp index c08283095..a3d73e679 100644 --- a/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp +++ b/src/opm/parser/eclipse/EclipseState/Grid/TransMult.cpp @@ -151,27 +151,13 @@ R"(This deck has the MULTREGT keyword located in the EDIT section. Note that: } } - std::array TransMult::getSize() const { - return {m_nx, m_ny, m_nz}; - } - - const std::map>& TransMult::getTrans() const { - return m_trans; - } - - const std::map& TransMult::getNames() const { - return m_names; - } - - const MULTREGTScanner& TransMult::getScanner() const { - return m_multregtScanner; - } - bool TransMult::operator==(const TransMult& data) const { - return this->getSize() == data.getSize() && - this->getTrans() == data.getTrans() && - this->getNames() == data.getNames() && - this->getScanner() == data.getScanner(); + return this->m_nx == data.m_nx && + this->m_ny == data.m_ny && + this->m_nz == data.m_nz && + this->m_trans == data.m_trans && + this->m_names == data.m_names && + this->m_multregtScanner == data.m_multregtScanner; } }