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

EclDefaultMaterial: do not limit the saturations in krn()

Browse Source 
this is required to get a match with the current opm-core satfuncs for
Norne.
This commit is contained in:
Andreas Lauser 2015-08-07 15:53:08 +02:00
parent 53309405c2
commit 8b9cfa0a65
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp
View File

@ -295,11 +295,8 @@ public:
Evaluation Sw = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(waterPhaseIdx)); Evaluation Sw = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(waterPhaseIdx));
Evaluation Sg = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(gasPhaseIdx)); Evaluation Sg = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(gasPhaseIdx));
Sw = Toolbox::min(1.0, Toolbox::max(Swco, Sw));
Sg = Toolbox::min(1.0, Toolbox::max(0.0, Sg));
Evaluation Sw_ow = Sg + Sw; Evaluation Sw_ow = Sg + Sw;
Evaluation So_go = 1 - Sw_ow + Swco; Evaluation So_go = 1 - Sw_ow; // == 1 - Sw - Sg;
const Evaluation& kro_ow = OilWaterMaterialLaw::twoPhaseSatKrn(params.oilWaterParams(), Sw_ow); const Evaluation& kro_ow = OilWaterMaterialLaw::twoPhaseSatKrn(params.oilWaterParams(), Sw_ow);
const Evaluation& kro_go = GasOilMaterialLaw::twoPhaseSatKrw(params.gasOilParams(), So_go); const Evaluation& kro_go = GasOilMaterialLaw::twoPhaseSatKrw(params.gasOilParams(), So_go);