OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-26 03:00:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enabling disGas and watVap at compile time for gasWaterBrine

Browse Source
This commit is contained in:
David Landa Marban 2023-11-07 14:47:41 +01:00
parent a42d52e644
commit 92de5355b2
11 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclequilinitializer.hh
View File

@ -78,7 +78,7 @@ class EclEquilInitializer
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
enum { enableDissolution = Indices::compositionSwitchIdx >= 0 };
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
enum { enableVapwat = getPropValue<TypeTag, Properties::EnableVapwat>() };
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
enum { has_disgas_in_water = getPropValue<TypeTag, Properties::EnableDisgasInWater>() };
@ -91,7 +91,7 @@ public:
enableTemperature,
enableEnergy,
enableDissolution,
enableEvaporation,
enableVapwat,
enableBrine,
enableSaltPrecipitation,
has_disgas_in_water,

2
flow/flow_ebos_brine_precsalt_vapwat.cpp
View File

@ -41,7 +41,7 @@ struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowBrinePrecsaltVapwatProblem>
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowBrinePrecsaltVapwatProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowBrinePrecsaltVapwatProblem> {
static constexpr bool value = true;
};
}}

8
flow/flow_ebos_gaswater_brine.cpp
View File

@ -36,6 +36,14 @@ template<class TypeTag>
struct EnableBrine<TypeTag, TTag::EclFlowGasWaterBrineProblem> {
static constexpr bool value = true;
};
template<class TypeTag>
struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterBrineProblem> {
static constexpr bool value = true;
};
template<class TypeTag>
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterBrineProblem> {
static constexpr bool value = true;
};
//! The indices required by the model
template<class TypeTag>
struct Indices<TypeTag, TTag::EclFlowGasWaterBrineProblem>

2
flow/flow_ebos_gaswater_dissolution.cpp
View File

@ -54,7 +54,7 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterDissolutionProblem> {
static constexpr bool value = true;
};

2
flow/flow_ebos_gaswater_dissolution_diffuse.cpp
View File

@ -54,7 +54,7 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProbl
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterDissolutionDiffuseProblem> {
static constexpr bool value = true;
};

2
flow/flow_ebos_gaswater_energy.cpp
View File

@ -59,7 +59,7 @@ struct EnableDisgasInWater<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterEnergyProblem> {
static constexpr bool value = true;
};

2
flow/flow_ebos_gaswater_saltprec_energy.cpp
View File

@ -43,7 +43,7 @@ struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowGasWaterSaltprecEnergyProbl
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterSaltprecEnergyProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterSaltprecEnergyProblem> {
static constexpr bool value = true;
};

2
flow/flow_ebos_gaswater_saltprec_vapwat.cpp
View File

@ -43,7 +43,7 @@ struct EnableSaltPrecipitation<TypeTag, TTag::EclFlowGasWaterSaltprecVapwatProbl
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::EclFlowGasWaterSaltprecVapwatProblem> {
struct EnableVapwat<TypeTag, TTag::EclFlowGasWaterSaltprecVapwatProblem> {
static constexpr bool value = true;
};

4
opm/simulators/aquifers/AquiferAnalytical.hpp
View File

@ -65,7 +65,7 @@ public:
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
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>() };
@ -80,7 +80,7 @@ public:
enableTemperature,
enableEnergy,
BlackoilIndices::gasEnabled,
enableEvaporation,
enableVapwat,
enableBrine,
enableSaltPrecipitation,
has_disgas_in_water,

2
opm/simulators/wells/WellInterface.hpp
View File

@ -117,7 +117,7 @@ public:
static constexpr bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
static constexpr bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
static constexpr bool has_brine = getPropValue<TypeTag, Properties::EnableBrine>();
static constexpr bool has_watVapor = getPropValue<TypeTag, Properties::EnableEvaporation>();
static constexpr bool has_watVapor = getPropValue<TypeTag, Properties::EnableVapwat>();
static constexpr bool has_disgas_in_water = getPropValue<TypeTag, Properties::EnableDisgasInWater>();
static constexpr bool has_saltPrecip = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>();
static constexpr bool has_micp = getPropValue<TypeTag, Properties::EnableMICP>();

4
tests/test_equil.cc
View File

@ -94,7 +94,7 @@ struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> {
using type = BlackoilWellModel<TypeTag>;
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::TestEquilTypeTag> {
struct EnableVapwat<TypeTag, TTag::TestEquilTypeTag> {
static constexpr bool value = true;
};
template<class TypeTag>
@ -102,7 +102,7 @@ struct EclWellModel<TypeTag, TTag::TestEquilVapwatTypeTag> {
using type = BlackoilWellModel<TypeTag>;
};
template<class TypeTag>
struct EnableEvaporation<TypeTag, TTag::TestEquilVapwatTypeTag> {
struct EnableVapwat<TypeTag, TTag::TestEquilVapwatTypeTag> {
static constexpr bool value = true;
};
} // namespace Opm::Properties