From ace6a25210ef3a72fc7a3e09f896cc557b9f4112 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Tue, 15 Sep 2015 13:35:09 +0200 Subject: [PATCH] Use tabulated oil saturations directly in KROG for familyII Revert bug introduced when refactoring the code in the process of supporting two-phase simulations. --- .../fluidmatrixinteractions/EclMaterialLawManager.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp index fb9176bb7..3dd5872bc 100644 --- a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp +++ b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp @@ -713,13 +713,12 @@ private: { // convert the saturations of the SGFN keyword from gas to oil saturations std::vector SoSamples(sgfnTable.numRows()); - std::vector SoKroSamples(sgfnTable.numRows()); + const auto &SoColumn = sof3Table.getSoColumn(); for (size_t sampleIdx = 0; sampleIdx < sgfnTable.numRows(); ++ sampleIdx) { SoSamples[sampleIdx] = 1 - sgfnTable.getSgColumn()[sampleIdx]; - SoKroSamples[sampleIdx] = SoSamples[sampleIdx] - Swco; } - effParams.setKrwSamples(SoKroSamples, sof3Table.getKrogColumn()); + effParams.setKrwSamples(SoColumn, sof3Table.getKrogColumn()); effParams.setKrnSamples(SoSamples, sgfnTable.getKrgColumn()); effParams.setPcnwSamples(SoSamples, sgfnTable.getPcogColumn()); effParams.finalize();