OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor modifications requested in review.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2019-08-08 10:27:17 +02:00
parent b4bd3d66e4
commit 544aeea40b
5 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/models/blackoil/blackoilintensivequantities.hh
View File

@@ -129,7 +129,7 @@ public:
// extract the water and the gas saturations for convenience
Evaluation Sw = 0.0;
if (waterEnabled){
if(priVars.primaryVarsMeaning() == PrimaryVariables::px){
if(priVars.primaryVarsMeaning() == PrimaryVariables::OnePhase_p){
Sw = 1.0;
}else{
Sw = priVars.makeEvaluation(Indices::waterSaturationIdx, timeIdx);
@@ -140,7 +140,7 @@ public:
{
if (priVars.primaryVarsMeaning() == PrimaryVariables::Sw_po_Sg) {
// -> threephase case
assert( not(priVars.primaryVarsMeaning() == PrimaryVariables::px) );
assert( not(priVars.primaryVarsMeaning() == PrimaryVariables::OnePhase_p) );
Sg = priVars.makeEvaluation(Indices::compositionSwitchIdx, timeIdx);
} else if (priVars.primaryVarsMeaning() == PrimaryVariables::Sw_pg_Rv) {
// -> gas-water case
@@ -284,7 +284,7 @@ public:
fluidState_.setRs(0.0);
}
} else {
assert(priVars.primaryVarsMeaning() == PrimaryVariables::px);
assert(priVars.primaryVarsMeaning() == PrimaryVariables::OnePhase_p);
}
typename FluidSystem::template ParameterCache<Evaluation> paramCache;