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

Use TableManager in AquiferCT constructor

Browse Source
This commit is contained in:
Joakim Hove
2020-02-05 16:52:34 +01:00
parent b57a4a39a3
commit ca4c10f810
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/AquiferCT.hpp
View File

@@ -39,7 +39,7 @@
namespace Opm {
class EclipseState;
class TableManager;
class AquiferCT {
public:
@@ -66,7 +66,7 @@ namespace Opm {
std::vector<double> td, pi;
};
AquiferCT(const EclipseState& eclState, const Deck& deck);
AquiferCT(const TableManager& tables, const Deck& deck);
const std::vector<AquiferCT::AQUCT_data>& getAquifers() const;
int getAqInflTabID(size_t aquiferIndex);

5
src/opm/parser/eclipse/EclipseState/AquiferCT.cpp
View File

@@ -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();

2
tests/parser/AquiferCTTests.cpp
View File

@@ -101,7 +101,7 @@ inline Deck createAquiferCTDeckDefaultP0() {
inline std::vector<AquiferCT::AQUCT_data> init_aquiferct(Deck& deck){
EclipseState eclState( deck );
AquiferCT aquct( eclState, deck);
AquiferCT aquct( eclState.getTableManager(), deck);
std::vector<AquiferCT::AQUCT_data> aquiferct = aquct.getAquifers();
return aquiferct;