From c69f7f2c99399fd7d9e342d25dc5aa6685ceb60a Mon Sep 17 00:00:00 2001
From: David Landa Marban <dmar@norceresearch.no>
Date: Tue, 7 Nov 2023 17:55:38 +0100
Subject: [PATCH] Renaming enableEvaporation to enableVapwat

---
 opm/models/blackoil/blackoilintensivequantities.hh | 8 ++++----
 opm/models/blackoil/blackoilmodel.hh               | 2 +-
 opm/models/blackoil/blackoilprimaryvariables.hh    | 2 +-
 opm/models/blackoil/blackoilproperties.hh          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
index 93fa5c31d..db00dc53f 100644
--- a/opm/models/blackoil/blackoilintensivequantities.hh
+++ b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -97,7 +97,7 @@ class BlackOilIntensiveQuantities
     enum { enablePolymer = getPropValue<TypeTag, Properties::EnablePolymer>() };
     enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() };
     enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
-    enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
+    enum { enableVapwat = getPropValue<TypeTag, Properties::EnableVapwat>() };
     enum { has_disgas_in_water = getPropValue<TypeTag, Properties::EnableDisgasInWater>() };
     enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
     enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
@@ -134,7 +134,7 @@ public:
                                           enableTemperature,
                                           enableEnergy,
                                           compositionSwitchEnabled,
-                                          enableEvaporation,
+                                          enableVapwat,
                                           enableBrine,
                                           enableSaltPrecipitation,
                                           has_disgas_in_water,
@@ -144,7 +144,7 @@ public:
                                                 enableTemperature,
                                                 enableEnergy,
                                                 compositionSwitchEnabled,
-                                                enableEvaporation,
+                                                enableVapwat,
                                                 enableBrine,
                                                 enableSaltPrecipitation,
                                                 has_disgas_in_water,
@@ -157,7 +157,7 @@ public:
             fluidState_.setRs(0.0);
             fluidState_.setRv(0.0);
         }        
-        if (enableEvaporation) { 
+        if (enableVapwat) { 
             fluidState_.setRvw(0.0);
         }
         if (has_disgas_in_water) {
diff --git a/opm/models/blackoil/blackoilmodel.hh b/opm/models/blackoil/blackoilmodel.hh
index 0576dc820..7d55712c7 100644
--- a/opm/models/blackoil/blackoilmodel.hh
+++ b/opm/models/blackoil/blackoilmodel.hh
@@ -159,7 +159,7 @@ struct EnableFoam<TypeTag, TTag::BlackOilModel> { static constexpr bool value =
 template<class TypeTag>
 struct EnableBrine<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
 template<class TypeTag>
-struct EnableEvaporation<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
+struct EnableVapwat<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
 template<class TypeTag>
 struct EnableDisgasInWater<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
 template<class TypeTag>
diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh
index 1c8d213b8..a48ea8522 100644
--- a/opm/models/blackoil/blackoilprimaryvariables.hh
+++ b/opm/models/blackoil/blackoilprimaryvariables.hh
@@ -103,7 +103,7 @@ class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
     enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() };
     enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
     enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
-    enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
+    enum { enableVapwat = getPropValue<TypeTag, Properties::EnableVapwat>() };
     enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
     enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
     enum { enableMICP = getPropValue<TypeTag, Properties::EnableMICP>() };
diff --git a/opm/models/blackoil/blackoilproperties.hh b/opm/models/blackoil/blackoilproperties.hh
index 042c8f50c..309474165 100644
--- a/opm/models/blackoil/blackoilproperties.hh
+++ b/opm/models/blackoil/blackoilproperties.hh
@@ -63,7 +63,7 @@ template<class TypeTag, class MyTypeTag>
 struct EnableSaltPrecipitation { using type = UndefinedProperty; };
 //! Enable the ECL-blackoil extension for water evaporation
 template<class TypeTag, class MyTypeTag>
-struct EnableEvaporation { using type = UndefinedProperty; };
+struct EnableVapwat { using type = UndefinedProperty; };
 //! Enable the ECL-blackoil extension for disolution of gas into water
 template<class TypeTag, class MyTypeTag>
 struct EnableDisgasInWater { using type = UndefinedProperty; };