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

--changed for bska comments. All tests ok locally

Browse Source
This commit is contained in:
hnil
2023-06-14 09:31:20 +02:00
parent b50cef1af2
commit 12da4dbe02
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

3
opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
View File

@@ -324,7 +324,8 @@ public:
constexpr int ndim = 3;
Dir facedirs[ndim] = {Dir::XPlus, Dir::YPlus, Dir::ZPlus};
for (int i = 0; i<ndim; i++) {
changed = changed || MaterialLaw::updateHysteresis(materialLawParams(elemIdx, facedirs[i]), fluidState);
bool ischanged = MaterialLaw::updateHysteresis(materialLawParams(elemIdx, facedirs[i]), fluidState);
changed = changed || ischanged;
}
}
return changed;