diff --git a/opm/parser/eclipse/EclipseState/AquiferCT.hpp b/opm/parser/eclipse/EclipseState/AquiferCT.hpp index e9c508e7d..3f54a6086 100755 --- a/opm/parser/eclipse/EclipseState/AquiferCT.hpp +++ b/opm/parser/eclipse/EclipseState/AquiferCT.hpp @@ -39,7 +39,7 @@ namespace Opm { - class EclipseState; + class TableManager; class AquiferCT { public: @@ -66,7 +66,7 @@ namespace Opm { std::vector td, pi; }; - AquiferCT(const EclipseState& eclState, const Deck& deck); + AquiferCT(const TableManager& tables, const Deck& deck); const std::vector& getAquifers() const; int getAqInflTabID(size_t aquiferIndex); diff --git a/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp b/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp index 69d1c2f15..2ff036e47 100755 --- a/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp +++ b/src/opm/parser/eclipse/EclipseState/AquiferCT.cpp @@ -22,13 +22,12 @@ namespace Opm { - AquiferCT::AquiferCT(const EclipseState& eclState, const Deck& deck) + AquiferCT::AquiferCT(const TableManager& tables, const Deck& deck) { if (!deck.hasKeyword("AQUCT")) return; const auto& aquctKeyword = deck.getKeyword("AQUCT"); - for (auto& aquctRecord : aquctKeyword){ AquiferCT::AQUCT_data data; @@ -53,7 +52,7 @@ namespace Opm { // Get the correct influence table values if (data.inftableID > 1){ - const auto& aqutabTable = eclState.getTableManager().getAqutabTables().getTable(data.inftableID - 2); + const auto& aqutabTable = tables.getAqutabTables().getTable(data.inftableID - 2); const auto& aqutab_tdColumn = aqutabTable.getColumn(0); const auto& aqutab_piColumn = aqutabTable.getColumn(1); data.td = aqutab_tdColumn.vectorCopy(); diff --git a/tests/parser/AquiferCTTests.cpp b/tests/parser/AquiferCTTests.cpp index 15fbeda54..c577b667c 100755 --- a/tests/parser/AquiferCTTests.cpp +++ b/tests/parser/AquiferCTTests.cpp @@ -101,7 +101,7 @@ inline Deck createAquiferCTDeckDefaultP0() { inline std::vector init_aquiferct(Deck& deck){ EclipseState eclState( deck ); - AquiferCT aquct( eclState, deck); + AquiferCT aquct( eclState.getTableManager(), deck); std::vector aquiferct = aquct.getAquifers(); return aquiferct;