mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #1793 from jalvestad/cell-summary-props
Changes to provide Summary data output of additional block variables
This commit is contained in:
commit
4a5dcdca75
@ -607,8 +607,26 @@ public:
|
|||||||
val.second = Opm::getValue(fs.saturation(waterPhaseIdx));
|
val.second = Opm::getValue(fs.saturation(waterPhaseIdx));
|
||||||
else if (key.first == "BGSAT")
|
else if (key.first == "BGSAT")
|
||||||
val.second = Opm::getValue(fs.saturation(gasPhaseIdx));
|
val.second = Opm::getValue(fs.saturation(gasPhaseIdx));
|
||||||
|
else if (key.first == "BOSAT")
|
||||||
|
val.second = 1. - Opm::getValue(fs.saturation(gasPhaseIdx)) - Opm::getValue(fs.saturation(waterPhaseIdx));
|
||||||
else if (key.first == "BPR")
|
else if (key.first == "BPR")
|
||||||
val.second = Opm::getValue(fs.pressure(oilPhaseIdx));
|
val.second = Opm::getValue(fs.pressure(oilPhaseIdx));
|
||||||
|
else if (key.first == "BWKR" || key.first == "BKRW")
|
||||||
|
val.second = Opm::getValue(intQuants.relativePermeability(waterPhaseIdx));
|
||||||
|
else if (key.first == "BGKR" || key.first == "BKRG")
|
||||||
|
val.second = Opm::getValue(intQuants.relativePermeability(gasPhaseIdx));
|
||||||
|
else if (key.first == "BOKR" || key.first == "BKRO")
|
||||||
|
val.second = Opm::getValue(intQuants.relativePermeability(oilPhaseIdx));
|
||||||
|
else if (key.first == "BWPC")
|
||||||
|
val.second = Opm::getValue(fs.pressure(oilPhaseIdx)) - Opm::getValue(fs.pressure(waterPhaseIdx));
|
||||||
|
else if (key.first == "BGPC")
|
||||||
|
val.second = Opm::getValue(fs.pressure(gasPhaseIdx)) - Opm::getValue(fs.pressure(oilPhaseIdx));
|
||||||
|
else if (key.first == "BVWAT" || key.first == "BWVIS")
|
||||||
|
val.second = Opm::getValue(fs.viscosity(waterPhaseIdx));
|
||||||
|
else if (key.first == "BVGAS" || key.first == "BGVIS")
|
||||||
|
val.second = Opm::getValue(fs.viscosity(gasPhaseIdx));
|
||||||
|
else if (key.first == "BVOIL" || key.first == "BOVIS")
|
||||||
|
val.second = Opm::getValue(fs.viscosity(oilPhaseIdx));
|
||||||
else {
|
else {
|
||||||
std::string logstring = "Keyword '";
|
std::string logstring = "Keyword '";
|
||||||
logstring.append(key.first);
|
logstring.append(key.first);
|
||||||
|
Loading…
Reference in New Issue
Block a user