diff --git a/src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp b/src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp index 6c9139f9b..32a3f769f 100644 --- a/src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp +++ b/src/opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp @@ -104,9 +104,9 @@ readGasOilParameters_(GasOilEffectiveParamVector& dest, unsigned satRegionIdx) const TableContainer& sgofTables = tableManager.getSgofTables(); const TableContainer& slgofTables = tableManager.getSlgofTables(); if (!sgofTables.empty()) - readGasOilSgof_(effParams, Swco, tolcrit, sgofTables.getTable(satRegionIdx)); + readGasOilSgof_(effParams, Swco, tolcrit, sgofTables.template getTable(satRegionIdx)); else if (!slgofTables.empty()) - readGasOilSlgof_(effParams, Swco, tolcrit, slgofTables.getTable(satRegionIdx)); + readGasOilSlgof_(effParams, Swco, tolcrit, slgofTables.template getTable(satRegionIdx)); else if ( !tableManager.getSgofletTable().empty() ) { const auto& letSgofTab = tableManager.getSgofletTable()[satRegionIdx]; const std::vector dum; // dummy arg to comform with existing interface @@ -151,14 +151,14 @@ readGasOilParameters_(GasOilEffectiveParamVector& dest, unsigned satRegionIdx) case SatFuncControls::KeywordFamily::Family_II: { - const SgfnTable& sgfnTable = tableManager.getSgfnTables().getTable( satRegionIdx ); + const SgfnTable& sgfnTable = tableManager.getSgfnTables().template getTable( satRegionIdx ); if (!this->parent_.hasWater) { // oil and gas case - const Sof2Table& sof2Table = tableManager.getSof2Tables().getTable( satRegionIdx ); + const Sof2Table& sof2Table = tableManager.getSof2Tables().template getTable( satRegionIdx ); readGasOilFamily2_(effParams, Swco, tolcrit, sof2Table, sgfnTable, /*columnName=*/"KRO"); } else { - const Sof3Table& sof3Table = tableManager.getSof3Tables().getTable( satRegionIdx ); + const Sof3Table& sof3Table = tableManager.getSof3Tables().template getTable( satRegionIdx ); readGasOilFamily2_(effParams, Swco, tolcrit, sof3Table, sgfnTable, /* columnName=*/"KROG"); } break; @@ -269,8 +269,8 @@ readGasWaterParameters_(GasWaterEffectiveParamVector& dest, unsigned satRegionId case SatFuncControls::KeywordFamily::Family_II: { //Todo: allow also for Sgwfn table input as alternative to Sgfn and Swfn table input - const SgfnTable& sgfnTable = tableManager.getSgfnTables().getTable( satRegionIdx ); - const SwfnTable& swfnTable = tableManager.getSwfnTables().getTable( satRegionIdx ); + const SgfnTable& sgfnTable = tableManager.getSgfnTables().template getTable( satRegionIdx ); + const SwfnTable& swfnTable = tableManager.getSwfnTables().template getTable( satRegionIdx ); effParams.setApproach(SatCurveMultiplexerApproach::PiecewiseLinear); auto& realParams = effParams.template getRealParams(); @@ -316,7 +316,7 @@ readOilWaterParameters_(OilWaterEffectiveParamVector& dest, unsigned satRegionId case SatFuncControls::KeywordFamily::Family_I: { if (tableManager.hasTables("SWOF")) { - const auto& swofTable = tableManager.getSwofTables().getTable(satRegionIdx); + const auto& swofTable = tableManager.getSwofTables().template getTable(satRegionIdx); const std::vector SwColumn = swofTable.getColumn("SW").vectorCopy(); effParams.setApproach(SatCurveMultiplexerApproach::PiecewiseLinear); @@ -371,7 +371,7 @@ readOilWaterParameters_(OilWaterEffectiveParamVector& dest, unsigned satRegionId case SatFuncControls::KeywordFamily::Family_II: { - const auto& swfnTable = tableManager.getSwfnTables().getTable(satRegionIdx); + const auto& swfnTable = tableManager.getSwfnTables().template getTable(satRegionIdx); const std::vector SwColumn = swfnTable.getColumn("SW").vectorCopy(); effParams.setApproach(SatCurveMultiplexerApproach::PiecewiseLinear); @@ -381,7 +381,7 @@ readOilWaterParameters_(OilWaterEffectiveParamVector& dest, unsigned satRegionId realParams.setPcnwSamples(SwColumn, swfnTable.getColumn("PCOW").vectorCopy()); if (!this->parent_.hasGas) { - const auto& sof2Table = tableManager.getSof2Tables().getTable(satRegionIdx); + const auto& sof2Table = tableManager.getSof2Tables().template getTable(satRegionIdx); // convert the saturations of the SOF2 keyword from oil to water saturations std::vector SwSamples(sof2Table.numRows()); for (size_t sampleIdx = 0; sampleIdx < sof2Table.numRows(); ++ sampleIdx) @@ -389,7 +389,7 @@ readOilWaterParameters_(OilWaterEffectiveParamVector& dest, unsigned satRegionId realParams.setKrnSamples(SwSamples, normalizeKrValues_(tolcrit, sof2Table.getColumn("KRO"))); } else { - const auto& sof3Table = tableManager.getSof3Tables().getTable(satRegionIdx); + const auto& sof3Table = tableManager.getSof3Tables().template getTable(satRegionIdx); // convert the saturations of the SOF3 keyword from oil to water saturations std::vector SwSamples(sof3Table.numRows()); for (size_t sampleIdx = 0; sampleIdx < sof3Table.numRows(); ++ sampleIdx)