mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-09-05 04:40:19 -05:00
Merge pull request #5188 from daavid00/gaswaterBGIP
BGIP and BGIPL for gas water systems
This commit is contained in:
@@ -875,13 +875,25 @@ public:
|
||||
val.second = getValue(fs.invB(gasPhaseIdx)) * getValue(fs.saturation(gasPhaseIdx));
|
||||
|
||||
if (key.first == "BGIP") {
|
||||
val.second += getValue(fs.Rs()) * getValue(fs.invB(oilPhaseIdx))
|
||||
* getValue(fs.saturation(oilPhaseIdx));
|
||||
if (!FluidSystem::phaseIsActive(oilPhaseIdx)) {
|
||||
val.second += getValue(fs.Rsw()) * getValue(fs.invB(waterPhaseIdx))
|
||||
* getValue(fs.saturation(waterPhaseIdx));
|
||||
}
|
||||
else {
|
||||
val.second += getValue(fs.Rs()) * getValue(fs.invB(oilPhaseIdx))
|
||||
* getValue(fs.saturation(oilPhaseIdx));
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (key.first == "BGIPL") {
|
||||
val.second = getValue(fs.Rs()) * getValue(fs.invB(oilPhaseIdx))
|
||||
* getValue(fs.saturation(oilPhaseIdx));
|
||||
if (!FluidSystem::phaseIsActive(oilPhaseIdx)) {
|
||||
val.second = getValue(fs.Rsw()) * getValue(fs.invB(waterPhaseIdx))
|
||||
* getValue(fs.saturation(waterPhaseIdx));
|
||||
}
|
||||
else {
|
||||
val.second = getValue(fs.Rs()) * getValue(fs.invB(oilPhaseIdx))
|
||||
* getValue(fs.saturation(oilPhaseIdx));
|
||||
}
|
||||
}
|
||||
else { // BWIP
|
||||
val.second = getValue(fs.invB(waterPhaseIdx)) * getValue(fs.saturation(waterPhaseIdx));
|
||||
|
||||
Reference in New Issue
Block a user