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

Renaming enableEvaporation to enableVapwat

Browse Source
This commit is contained in:
David Landa Marban 2023-11-07 17:55:38 +01:00
parent b25af99362
commit c69f7f2c99
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ class BlackOilIntensiveQuantities
enum { enablePolymer = getPropValue<TypeTag, Properties::EnablePolymer>() }; enum { enablePolymer = getPropValue<TypeTag, Properties::EnablePolymer>() };
enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() }; enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() };
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() }; 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 { has_disgas_in_water = getPropValue<TypeTag, Properties::EnableDisgasInWater>() };
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() }; enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() }; enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
@ -134,7 +134,7 @@ public:
enableTemperature, enableTemperature,
enableEnergy, enableEnergy,
compositionSwitchEnabled, compositionSwitchEnabled,
enableEvaporation, enableVapwat,
enableBrine, enableBrine,
enableSaltPrecipitation, enableSaltPrecipitation,
has_disgas_in_water, has_disgas_in_water,
@ -144,7 +144,7 @@ public:
enableTemperature, enableTemperature,
enableEnergy, enableEnergy,
compositionSwitchEnabled, compositionSwitchEnabled,
enableEvaporation, enableVapwat,
enableBrine, enableBrine,
enableSaltPrecipitation, enableSaltPrecipitation,
has_disgas_in_water, has_disgas_in_water,
@ -157,7 +157,7 @@ public:
fluidState_.setRs(0.0); fluidState_.setRs(0.0);
fluidState_.setRv(0.0); fluidState_.setRv(0.0);
} }
if (enableEvaporation) { if (enableVapwat) {
fluidState_.setRvw(0.0); fluidState_.setRvw(0.0);
} }
if (has_disgas_in_water) { if (has_disgas_in_water) {

2
opm/models/blackoil/blackoilmodel.hh
View File

@ -159,7 +159,7 @@ struct EnableFoam<TypeTag, TTag::BlackOilModel> { static constexpr bool value =
template<class TypeTag> template<class TypeTag>
struct EnableBrine<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; }; struct EnableBrine<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
template<class TypeTag> 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> template<class TypeTag>
struct EnableDisgasInWater<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; }; struct EnableDisgasInWater<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
template<class TypeTag> template<class TypeTag>

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

@ -103,7 +103,7 @@ class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() }; enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() };
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() }; enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() }; 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 { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() }; enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
enum { enableMICP = getPropValue<TypeTag, Properties::EnableMICP>() }; enum { enableMICP = getPropValue<TypeTag, Properties::EnableMICP>() };

2
opm/models/blackoil/blackoilproperties.hh
View File

@ -63,7 +63,7 @@ template<class TypeTag, class MyTypeTag>
struct EnableSaltPrecipitation { using type = UndefinedProperty; }; struct EnableSaltPrecipitation { using type = UndefinedProperty; };
//! Enable the ECL-blackoil extension for water evaporation //! Enable the ECL-blackoil extension for water evaporation
template<class TypeTag, class MyTypeTag> 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 //! Enable the ECL-blackoil extension for disolution of gas into water
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct EnableDisgasInWater { using type = UndefinedProperty; }; struct EnableDisgasInWater { using type = UndefinedProperty; };