mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-01-21 19:02:58 -06:00
fix for the situation that hydrocarbon consist only of gas
This commit is contained in:
parent
ea4e4a1520
commit
a813d9e875
@ -496,20 +496,48 @@ namespace Opm {
|
|||||||
if (hydrocarbonPV > 0.) {
|
if (hydrocarbonPV > 0.) {
|
||||||
auto& attr = attributes_hpv[reg];
|
auto& attr = attributes_hpv[reg];
|
||||||
attr.pv += hydrocarbonPV;
|
attr.pv += hydrocarbonPV;
|
||||||
|
<<<<<<< HEAD
|
||||||
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
||||||
attr.rs += fs.Rs().value() * hydrocarbonPV;
|
attr.rs += fs.Rs().value() * hydrocarbonPV;
|
||||||
attr.rv += fs.Rv().value() * hydrocarbonPV;
|
attr.rv += fs.Rv().value() * hydrocarbonPV;
|
||||||
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
||||||
|
=======
|
||||||
|
if (Details::PhaseUsed::oil(pu)) {
|
||||||
|
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
||||||
|
attr.rs += fs.Rs().value() * hydrocarbonPV;
|
||||||
|
attr.rv += fs.Rv().value() * hydrocarbonPV;
|
||||||
|
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
assert(Details::PhaseUsed::gas(pu));
|
||||||
|
attr.pressure += fs.pressure(FluidSystem::gasPhaseIdx).value() * hydrocarbonPV;
|
||||||
|
attr.temperature += fs.temperature(FluidSystem::gasPhaseIdx).value() * hydrocarbonPV;
|
||||||
|
}
|
||||||
|
>>>>>>> 75076d46d... fix for the situation that hydrocarbon consist only of gas
|
||||||
attr.saltConcentration += fs.saltConcentration().value() * hydrocarbonPV;
|
attr.saltConcentration += fs.saltConcentration().value() * hydrocarbonPV;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pv_cell > 0.) {
|
if (pv_cell > 0.) {
|
||||||
auto& attr = attributes_pv[reg];
|
auto& attr = attributes_pv[reg];
|
||||||
attr.pv += pv_cell;
|
attr.pv += pv_cell;
|
||||||
|
<<<<<<< HEAD
|
||||||
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
||||||
attr.rs += fs.Rs().value() * pv_cell;
|
attr.rs += fs.Rs().value() * pv_cell;
|
||||||
attr.rv += fs.Rv().value() * pv_cell;
|
attr.rv += fs.Rv().value() * pv_cell;
|
||||||
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
||||||
|
=======
|
||||||
|
if (Details::PhaseUsed::oil(pu)) {
|
||||||
|
attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
||||||
|
attr.rs += fs.Rs().value() * pv_cell;
|
||||||
|
attr.rv += fs.Rv().value() * pv_cell;
|
||||||
|
attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * pv_cell;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
assert(Details::PhaseUsed::gas(pu));
|
||||||
|
attr.pressure += fs.pressure(FluidSystem::gasPhaseIdx).value() * pv_cell;
|
||||||
|
attr.temperature += fs.temperature(FluidSystem::gasPhaseIdx).value() * pv_cell;
|
||||||
|
}
|
||||||
|
>>>>>>> 75076d46d... fix for the situation that hydrocarbon consist only of gas
|
||||||
attr.saltConcentration += fs.saltConcentration().value() * pv_cell;
|
attr.saltConcentration += fs.saltConcentration().value() * pv_cell;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user