From 8cf963ba3fea84c63d0dac916893c202cd96987a Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Tue, 1 Sep 2015 12:21:11 +0200 Subject: [PATCH] Using TableManager class to get input tables. --- .../fluidmatrixinteractions/EclEpsScalingPoints.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp b/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp index 602b0f7ab..94e657028 100644 --- a/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp +++ b/opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp @@ -183,12 +183,13 @@ struct EclEpsScalingPointsInfo int satRegionIdx) { // TODO: support for the SOF2/SOF3 keyword family - const std::vector& swofTables = eclState->getSwofTables(); - const std::vector& sgofTables = eclState->getSgofTables(); - const std::vector& slgofTables = eclState->getSlgofTables(); - const std::vector& swfnTables = eclState->getSwfnTables(); - const std::vector& sgfnTables = eclState->getSgfnTables(); - const std::vector& sof3Tables = eclState->getSof3Tables(); + auto tables = eclState->getTableManager(); + const std::vector& swofTables = tables->getSwofTables(); + const std::vector& sgofTables = tables->getSgofTables(); + const std::vector& slgofTables = tables->getSlgofTables(); + const std::vector& swfnTables = tables->getSwfnTables(); + const std::vector& sgfnTables = tables->getSgfnTables(); + const std::vector& sof3Tables = tables->getSof3Tables(); bool family1 = (!sgofTables.empty() || !slgofTables.empty()) && !swofTables.empty(); bool family2 = !swfnTables.empty() && !sgfnTables.empty() && !sof3Tables.empty();