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

Neutral initialisation for no-hysteresis case.

Browse Source
This commit is contained in:
Ove Sævareid
2022-10-10 14:34:36 +02:00
parent 6268aa6604
commit bade82f44c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/material/fluidmatrixinteractions/EclHysteresisConfig.hpp
View File

@@ -43,8 +43,8 @@ public:
EclHysteresisConfig()
{
enableHysteresis_ = false;
pcHysteresisModel_ = 0;
krHysteresisModel_ = 0;
pcHysteresisModel_ = -1;
krHysteresisModel_ = -1;
}
/*!

8
opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp
View File

@@ -116,6 +116,9 @@ public:
oilWaterSystem_ = (twoPhaseSystem == EclOilWaterSystem);
if (!config().enableHysteresis())
return;
if (config().krHysteresisModel() == 2 || config().krHysteresisModel() == 3 || config().pcHysteresisModel() == 0) {
if (twoPhaseSystem == EclGasOilSystem) {
Sncrd_ = info.Sgcr+info.Swl;
@@ -162,6 +165,9 @@ public:
{
imbibitionParams_ = value;
if (!config().enableHysteresis())
return;
// Killough hysteresis model for nonw kr
if (config().krHysteresisModel() == 2 || config().krHysteresisModel() == 3 || config().pcHysteresisModel() == 0) {
if (twoPhaseSystem == EclGasOilSystem) {
@@ -470,7 +476,7 @@ private:
Scalar pcmaxd_; // max pc for drain
Scalar pcmaxi_; // max pc for imb
Scalar curvatureCapPrs_; // curvature parameter used for capillary pressure hysteresis
Scalar curvatureCapPrs_; // curvature parameter used for capillary pressure hysteresis
};
} // namespace Opm