Use tabulated oil saturations directly in KROG for familyII

Revert bug introduced when refactoring the code in the process of
supporting two-phase simulations.
This commit is contained in:
Tor Harald Sandve
2015-09-15 13:35:09 +02:00
parent 1b794a44f6
commit ace6a25210

View File

@@ -713,13 +713,12 @@ private:
{
// convert the saturations of the SGFN keyword from gas to oil saturations
std::vector<double> SoSamples(sgfnTable.numRows());
std::vector<double> 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();