OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 13:29:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3715 from goncalvesmachadoc/vapwat

Browse Source 
update parameters BlackoilFluidSystem
This commit is contained in:
Tor Harald Sandve 2021-12-09 15:37:49 +01:00 committed by GitHub
commit 1baee5ec9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebos/eclequilinitializer.hh
View File

@ -74,6 +74,8 @@ class EclEquilInitializer
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 { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
public:
// NB: setting the enableEnergy argument to true enables storage of enthalpy and
@ -83,7 +85,9 @@ public:
enableTemperature,
enableEnergy,
Indices::gasEnabled,
enableEvaporation,
enableBrine,
enableSaltPrecipitation,
Indices::numPhases>;

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

@ -59,6 +59,8 @@ 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 { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
static const int numEq = BlackoilIndices::numEq;
typedef double Scalar;
@ -70,7 +72,9 @@ public:
enableTemperature,
enableEnergy,
BlackoilIndices::gasEnabled,
enableEvaporation,
enableBrine,
enableSaltPrecipitation,
BlackoilIndices::numPhases>
FluidState;

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

@ -112,6 +112,8 @@ 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_saltPrecip = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>();
static constexpr bool has_micp = getPropValue<TypeTag, Properties::EnableMICP>();
// For the conversion between the surface volume rate and reservoir voidage rate
@ -120,7 +122,9 @@ public:
has_temperature,
has_energy,
Indices::compositionSwitchIdx >= 0,
has_watVapor,
has_brine,
has_saltPrecip,
Indices::numPhases >;
/// Constructor
WellInterface(const Well& well,