From 140a1c0bf37712a6b24452f69e8438b84c4acc89 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 5 Feb 2020 21:57:57 +0100 Subject: [PATCH] Add accessor and constructor for serialization --- opm/parser/eclipse/EclipseState/AquiferCT.hpp | 2 ++ src/opm/parser/eclipse/EclipseState/AquiferCT.cpp | 9 +++++++++ tests/parser/AquiferCTTests.cpp | 3 +++ 3 files changed, 14 insertions(+) diff --git a/opm/parser/eclipse/EclipseState/AquiferCT.hpp b/opm/parser/eclipse/EclipseState/AquiferCT.hpp index bd0a4cdfe..186254694 100755 --- a/opm/parser/eclipse/EclipseState/AquiferCT.hpp +++ b/opm/parser/eclipse/EclipseState/AquiferCT.hpp @@ -69,10 +69,12 @@ namespace Opm { }; AquiferCT(const TableManager& tables, const Deck& deck); + AquiferCT(const std::vector& data); std::size_t size() const; std::vector::const_iterator begin() const; std::vector::const_iterator end() const; + const std::vector& data() const; bool operator==(const AquiferCT& other) const; private: std::vector m_aquct; diff --git a/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp b/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp index 5fc9c0491..360d99e02 100755 --- a/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp +++ b/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp @@ -107,6 +107,10 @@ AquiferCT::AquiferCT(const TableManager& tables, const Deck& deck) this->m_aquct.emplace_back(record, tables); } +AquiferCT::AquiferCT(const std::vector& data) : + m_aquct(data) +{} + std::size_t AquiferCT::size() const { return this->m_aquct.size(); @@ -123,4 +127,9 @@ std::vector::const_iterator AquiferCT::end() const { bool AquiferCT::operator==(const AquiferCT& other) const { return this->m_aquct == other.m_aquct; } + +const std::vector& AquiferCT::data() const { + return this->m_aquct; +} + } diff --git a/tests/parser/AquiferCTTests.cpp b/tests/parser/AquiferCTTests.cpp index fbad73591..de009089a 100755 --- a/tests/parser/AquiferCTTests.cpp +++ b/tests/parser/AquiferCTTests.cpp @@ -127,5 +127,8 @@ BOOST_AUTO_TEST_CASE(AquiferCTTest){ BOOST_CHECK_EQUAL(it.inftableID , 2); BOOST_CHECK(it.p0.first == false); } + auto data = aquiferct.data(); + AquiferCT aq2(data); + BOOST_CHECK( aq2 == aquiferct ); } }