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

Rename PrimaryVarsMeaning{Water/Gas/Pressure/Brine} to {Water/Gas/Pressure/Brine}Meaning

Browse Source
This commit is contained in:
Tor Harald Sandve 2022-11-25 12:36:40 +01:00
parent 22d27bdf5f
commit bdb82c2f3d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclproblem.hh
View File

@ -1738,7 +1738,7 @@ public:
values[Indices::polymerMoleWeightIdx]= this->polymerMoleWeight_[globalDofIdx]; values[Indices::polymerMoleWeightIdx]= this->polymerMoleWeight_[globalDofIdx];
if constexpr (enableBrine) { if constexpr (enableBrine) {
if (enableSaltPrecipitation && values.primaryVarsMeaningBrine() == PrimaryVariables::Sp) { if (enableSaltPrecipitation && values.primaryVarsMeaningBrine() == PrimaryVariables::BrineMeaning::Sp) {
values[Indices::saltConcentrationIdx] = initialFluidStates_[globalDofIdx].saltSaturation(); values[Indices::saltConcentrationIdx] = initialFluidStates_[globalDofIdx].saltSaturation();
} }
else { else {

8
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -464,14 +464,14 @@ namespace Opm {
Scalar oilSaturationNew = 1.0; Scalar oilSaturationNew = 1.0;
if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx) && if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx) &&
FluidSystem::numActivePhases() > 1 && FluidSystem::numActivePhases() > 1 &&
priVarsNew.primaryVarsMeaningWater() == PrimaryVariables::PrimaryVarsMeaningWater::Sw) { priVarsNew.primaryVarsMeaningWater() == PrimaryVariables::WaterMeaning::Sw) {
saturationsNew[FluidSystem::waterPhaseIdx] = priVarsNew[Indices::waterSwitchIdx]; saturationsNew[FluidSystem::waterPhaseIdx] = priVarsNew[Indices::waterSwitchIdx];
oilSaturationNew -= saturationsNew[FluidSystem::waterPhaseIdx]; oilSaturationNew -= saturationsNew[FluidSystem::waterPhaseIdx];
} }
if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx) && if (FluidSystem::phaseIsActive(FluidSystem::gasPhaseIdx) &&
FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx) && FluidSystem::phaseIsActive(FluidSystem::oilPhaseIdx) &&
priVarsNew.primaryVarsMeaningGas() == PrimaryVariables::PrimaryVarsMeaningGas::Sg) { priVarsNew.primaryVarsMeaningGas() == PrimaryVariables::GasMeaning::Sg) {
assert(Indices::compositionSwitchIdx >= 0 ); assert(Indices::compositionSwitchIdx >= 0 );
saturationsNew[FluidSystem::gasPhaseIdx] = priVarsNew[Indices::compositionSwitchIdx]; saturationsNew[FluidSystem::gasPhaseIdx] = priVarsNew[Indices::compositionSwitchIdx];
oilSaturationNew -= saturationsNew[FluidSystem::gasPhaseIdx]; oilSaturationNew -= saturationsNew[FluidSystem::gasPhaseIdx];
@ -495,12 +495,12 @@ namespace Opm {
resultDenom += pressureNew*pressureNew; resultDenom += pressureNew*pressureNew;
if (FluidSystem::numActivePhases() > 1) { if (FluidSystem::numActivePhases() > 1) {
if (priVarsOld.primaryVarsMeaningWater() == PrimaryVariables::PrimaryVarsMeaningWater::Sw) { if (priVarsOld.primaryVarsMeaningWater() == PrimaryVariables::WaterMeaning::Sw) {
saturationsOld[FluidSystem::waterPhaseIdx] = priVarsOld[Indices::waterSwitchIdx]; saturationsOld[FluidSystem::waterPhaseIdx] = priVarsOld[Indices::waterSwitchIdx];
oilSaturationOld -= saturationsOld[FluidSystem::waterPhaseIdx]; oilSaturationOld -= saturationsOld[FluidSystem::waterPhaseIdx];
} }
if (priVarsOld.primaryVarsMeaningGas() == PrimaryVariables::PrimaryVarsMeaningGas::Sg) if (priVarsOld.primaryVarsMeaningGas() == PrimaryVariables::GasMeaning::Sg)
{ {
assert(Indices::compositionSwitchIdx >= 0 ); assert(Indices::compositionSwitchIdx >= 0 );
saturationsOld[FluidSystem::gasPhaseIdx] = priVarsOld[Indices::compositionSwitchIdx]; saturationsOld[FluidSystem::gasPhaseIdx] = priVarsOld[Indices::compositionSwitchIdx];