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

clean up

Browse Source
This commit is contained in:
Paul Egberts 2022-03-06 18:07:32 +01:00
parent 7b04c9641d
commit b5836354c2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,13 +266,11 @@ public:
fluidState_.setRv(0.0); fluidState_.setRv(0.0);
if (FluidSystem::enableVaporizedWater()) { if (FluidSystem::enableVaporizedWater()) {
const Evaluation& RvwSat = FluidSystem::saturatedWaterVaporationFactor(fluidState_, const Evaluation& RvwSat = FluidSystem::saturatedVaporizationFactor(fluidState_,
gasPhaseIdx, gasPhaseIdx,
pvtRegionIdx); pvtRegionIdx);
fluidState_.setRvw(RvwSat); fluidState_.setRvw(RvwSat);
} }
else //if (compositionSwitchEnabled)
fluidState_.setRvw(0.0);
} }
else if (priVars.primaryVarsMeaning() == PrimaryVariables::Rvw_po_Sg) { else if (priVars.primaryVarsMeaning() == PrimaryVariables::Rvw_po_Sg) {
// The switching variable is the water-gas ratio Rvw // The switching variable is the water-gas ratio Rvw

10
opm/models/blackoil/blackoilprimaryvariables.hh
View File

@ -488,7 +488,8 @@ public:
T, T,
pg); pg);
setPrimaryVarsMeaning(Rvw_po_Sg); setPrimaryVarsMeaning(Rvw_po_Sg);
//Sw = 0.0; //check (*this)[Indices::waterSaturationIdx] = RvwSat; //primary variable becomes Rvw
return true; return true;
} }
@ -607,9 +608,14 @@ public:
Scalar po = (*this)[Indices::pressureSwitchIdx]; Scalar po = (*this)[Indices::pressureSwitchIdx];
Scalar T = asImp_().temperature_(); Scalar T = asImp_().temperature_();
Scalar Sg = 0.0;
if (compositionSwitchEnabled)
Sg = (*this)[Indices::compositionSwitchIdx];
Scalar So = 1.0 - Sg - solventSaturation_();
Scalar pC[numPhases] = { 0.0 }; Scalar pC[numPhases] = { 0.0 };
const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx); const MaterialLawParams& matParams = problem.materialLawParams(globalDofIdx);
computeCapillaryPressures_(pC, So, Sg + solventSaturation_(), Sw, matParams); computeCapillaryPressures_(pC, So, Sg + solventSaturation_(), /*Sw=*/ 0.0, matParams);
Scalar pg = po + (pC[gasPhaseIdx] - pC[oilPhaseIdx]); Scalar pg = po + (pC[gasPhaseIdx] - pC[oilPhaseIdx]);
Scalar RvwSat = FluidSystem::gasPvt().saturatedWaterVaporizationFactor(pvtRegionIdx_, Scalar RvwSat = FluidSystem::gasPvt().saturatedWaterVaporizationFactor(pvtRegionIdx_,
T, T,