OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3750 from daavid00/renamingToEnableVapwat

Browse Source 
Renaming enableEvaporation to enableVapwat
This commit is contained in:
Tor Harald Sandve 2023-11-13 15:01:19 +01:00 committed by GitHub
commit 5309471632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/material/fluidstates/BlackOilFluidState.hpp
View File

@ -111,7 +111,7 @@ template <class ScalarT,
bool enableTemperature = false, bool enableTemperature = false,
bool enableEnergy = false, bool enableEnergy = false,
bool enableDissolution = true, bool enableDissolution = true,
bool enableEvaporation = false, bool enableVapwat = false,
bool enableBrine = false, bool enableBrine = false,
bool enableSaltPrecipitation = false, bool enableSaltPrecipitation = false,
bool enableDissolutionInWater = false, bool enableDissolutionInWater = false,
@ -159,7 +159,7 @@ public:
Valgrind::CheckDefined(*Rv_); Valgrind::CheckDefined(*Rv_);
} }
if constexpr (enableEvaporation) { if constexpr (enableVapwat) {
Valgrind::CheckDefined(*Rvw_); Valgrind::CheckDefined(*Rvw_);
} }
@ -197,7 +197,7 @@ public:
setRs(BlackOil::getRs_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx)); setRs(BlackOil::getRs_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx));
setRv(BlackOil::getRv_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx)); setRv(BlackOil::getRv_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx));
} }
if constexpr (enableEvaporation) { if constexpr (enableVapwat) {
setRvw(BlackOil::getRvw_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx)); setRvw(BlackOil::getRvw_<FluidSystem, FluidState, Scalar>(fs, pvtRegionIdx));
} }
if constexpr (enableDissolutionInWater) { if constexpr (enableDissolutionInWater) {
@ -430,7 +430,7 @@ public:
*/ */
const Scalar& Rvw() const const Scalar& Rvw() const
{ {
if constexpr (enableEvaporation) { if constexpr (enableVapwat) {
return *Rvw_; return *Rvw_;
} else { } else {
static Scalar null = 0.0; static Scalar null = 0.0;
@ -685,7 +685,7 @@ private:
std::array<Scalar, numStoragePhases> density_; std::array<Scalar, numStoragePhases> density_;
ConditionalStorage<enableDissolution,Scalar> Rs_; ConditionalStorage<enableDissolution,Scalar> Rs_;
ConditionalStorage<enableDissolution, Scalar> Rv_; ConditionalStorage<enableDissolution, Scalar> Rv_;
ConditionalStorage<enableEvaporation,Scalar> Rvw_; ConditionalStorage<enableVapwat,Scalar> Rvw_;
ConditionalStorage<enableDissolutionInWater,Scalar> Rsw_; ConditionalStorage<enableDissolutionInWater,Scalar> Rsw_;
ConditionalStorage<enableBrine, Scalar> saltConcentration_; ConditionalStorage<enableBrine, Scalar> saltConcentration_;
ConditionalStorage<enableSaltPrecipitation, Scalar> saltSaturation_; ConditionalStorage<enableSaltPrecipitation, Scalar> saltSaturation_;