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

Merge pull request #35 from andlaus/connate_water_fixes

Browse Source 
Connate water fixes
This commit is contained in:
Andreas Lauser 2015-08-14 09:26:10 +02:00
commit 83de8aceb1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,16 +293,18 @@ public:
Scalar Swco = params.Swl();
Evaluation Sw = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(waterPhaseIdx));
Evaluation Sw =
Toolbox::max(Evaluation(Swco),
FsToolbox::template toLhs<Evaluation>(fluidState.saturation(waterPhaseIdx)));
Evaluation Sg = FsToolbox::template toLhs<Evaluation>(fluidState.saturation(gasPhaseIdx));
Evaluation Sw_ow = Sg + Sw;
Evaluation So_go = 1 - Sw_ow; // == 1 - Sw - Sg;
Evaluation So_go = 1.0 + Swco - Sw_ow;
const Evaluation& kro_ow = OilWaterMaterialLaw::twoPhaseSatKrn(params.oilWaterParams(), Sw_ow);
const Evaluation& kro_go = GasOilMaterialLaw::twoPhaseSatKrw(params.gasOilParams(), So_go);
Evaluation kro;
if (std::abs(Toolbox::value(Sg) + Toolbox::value(Sw) - Swco) < 1e-50)
if (Toolbox::value(Sg) + Toolbox::value(Sw) - Swco < 1e-20)
kro = kro_ow; // avoid division by zero
else {
const auto& weightOilWater = (Sw - Swco)/(Sg + Sw - Swco);
@ -310,7 +312,7 @@ public:
kro = weightOilWater*kro_ow + weightGasOil*kro_go;
}
return Toolbox::min(1.0, Toolbox::max(0.0, kro));
return kro;
}
/*!