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

Use temperature from depth in primaryvariable switching

Browse Source
This commit is contained in:
Tor Harald Sandve
2023-09-18 12:34:52 +02:00
parent e6220e7563
commit 0719601e2b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,7 @@ class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
enum { enableMICP = getPropValue<TypeTag, Properties::EnableMICP>() };
enum { gasCompIdx = FluidSystem::gasCompIdx };
enum { waterCompIdx = FluidSystem::waterCompIdx };
@@ -511,7 +512,7 @@ public:
Scalar sw = 0.0;
Scalar sg = 0.0;
Scalar saltConcentration = 0.0;
const Scalar& T = asImp_().temperature_();
const Scalar& T = asImp_().temperature_(problem, globalDofIdx);
if (primaryVarsMeaningWater() == WaterMeaning::Sw)
sw = (*this)[waterSwitchIdx];
if (primaryVarsMeaningGas() == GasMeaning::Sg)
@@ -950,10 +951,13 @@ private:
return 0.0;
}
Scalar temperature_() const
Scalar temperature_(const Problem& problem, unsigned globalDofIdx) const
{
if constexpr (enableEnergy)
return (*this)[Indices::temperatureIdx];
else if constexpr( enableTemperature)
return problem.temperature(globalDofIdx, /*timeIdx*/ 0);
else
return FluidSystem::reservoirTemperature();
}