diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp index 4f5a15743..035a2934f 100644 --- a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp @@ -440,25 +440,30 @@ public: // // Though be aware that from a physical perspective this is definitively // incorrect! - changed = changed || params.oilWaterParams().update(/*pcSw=*/ Sw, //1.0 - So, (Effect is significant vs benchmark.) + bool oilchanged = params.oilWaterParams().update(/*pcSw=*/ Sw, //1.0 - So, (Effect is significant vs benchmark.) /*krwSw=*/ 1.0 - So, /*krnSw=*/ 1.0 - So); + + changed = changed || oilchanged; - changed = changed || params.gasOilParams().update(/*pcSw=*/ 1.0 - Swco - Sg, + bool gaschanged = params.gasOilParams().update(/*pcSw=*/ 1.0 - Swco - Sg, /*krwSw=*/ 1.0 - Swco - Sg, - /*krnSw=*/ 1.0 - Swco - Sg); + /*krnSw=*/ 1.0 - Swco - Sg); + + changed = changed || gaschanged; } else { const Scalar Sw_ow = Sg + std::max(Swco, Sw); const Scalar So_go = 1.0 - Sw_ow; - - changed = changed || params.oilWaterParams().update(/*pcSw=*/ Sw, - /*krwSw=*/ 1 - Sg, - /*krnSw=*/ Sw_ow); - - changed = changed || params.gasOilParams().update(/*pcSw=*/ 1.0 - Swco - Sg, + bool oilchanged = params.oilWaterParams().update(/*pcSw=*/ Sw, + /*krwSw=*/ 1 - Sg, + /*krnSw=*/ Sw_ow); + changed = changed || oilchanged; + bool gaschanged = params.gasOilParams().update(/*pcSw=*/ 1.0 - Swco - Sg, /*krwSw=*/ So_go, /*krnSw=*/ 1.0 - Swco - Sg); + + changed = changed || gaschanged; } return changed; } diff --git a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp index 5a36f8c2b..874806304 100644 --- a/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp +++ b/opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp @@ -324,7 +324,8 @@ public: constexpr int ndim = 3; Dir facedirs[ndim] = {Dir::XPlus, Dir::YPlus, Dir::ZPlus}; for (int i = 0; i