From ab2b3faf0a13565ca9ee17514628118d7e7af32c Mon Sep 17 00:00:00 2001 From: David Landa Marban Date: Tue, 7 Nov 2023 17:55:18 +0100 Subject: [PATCH] Renaming enableEvaporation to enableVapwat --- opm/material/fluidstates/BlackOilFluidState.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opm/material/fluidstates/BlackOilFluidState.hpp b/opm/material/fluidstates/BlackOilFluidState.hpp index 1ed8c47d7..7bbccc8e1 100644 --- a/opm/material/fluidstates/BlackOilFluidState.hpp +++ b/opm/material/fluidstates/BlackOilFluidState.hpp @@ -111,7 +111,7 @@ template (fs, pvtRegionIdx)); setRv(BlackOil::getRv_(fs, pvtRegionIdx)); } - if constexpr (enableEvaporation) { + if constexpr (enableVapwat) { setRvw(BlackOil::getRvw_(fs, pvtRegionIdx)); } if constexpr (enableDissolutionInWater) { @@ -430,7 +430,7 @@ public: */ const Scalar& Rvw() const { - if constexpr (enableEvaporation) { + if constexpr (enableVapwat) { return *Rvw_; } else { static Scalar null = 0.0; @@ -685,7 +685,7 @@ private: std::array density_; ConditionalStorage Rs_; ConditionalStorage Rv_; - ConditionalStorage Rvw_; + ConditionalStorage Rvw_; ConditionalStorage Rsw_; ConditionalStorage saltConcentration_; ConditionalStorage saltSaturation_;