mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
update parameters BlackoilFluidSystem
fix update parameters BlackoilFluidSystem
This commit is contained in:
parent
ad10e419da
commit
90380c35ad
@ -74,6 +74,8 @@ class EclEquilInitializer
|
|||||||
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
|
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
|
||||||
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
|
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
|
||||||
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
|
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
|
||||||
|
enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
|
||||||
|
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// NB: setting the enableEnergy argument to true enables storage of enthalpy and
|
// NB: setting the enableEnergy argument to true enables storage of enthalpy and
|
||||||
@ -83,7 +85,9 @@ public:
|
|||||||
enableTemperature,
|
enableTemperature,
|
||||||
enableEnergy,
|
enableEnergy,
|
||||||
Indices::gasEnabled,
|
Indices::gasEnabled,
|
||||||
|
enableEvaporation,
|
||||||
enableBrine,
|
enableBrine,
|
||||||
|
enableSaltPrecipitation,
|
||||||
Indices::numPhases>;
|
Indices::numPhases>;
|
||||||
|
|
||||||
|
|
||||||
|
@ -59,6 +59,8 @@ public:
|
|||||||
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
|
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
|
||||||
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
|
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
|
||||||
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
|
enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
|
||||||
|
enum { enableEvaporation = getPropValue<TypeTag, Properties::EnableEvaporation>() };
|
||||||
|
enum { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
|
||||||
|
|
||||||
static const int numEq = BlackoilIndices::numEq;
|
static const int numEq = BlackoilIndices::numEq;
|
||||||
typedef double Scalar;
|
typedef double Scalar;
|
||||||
@ -70,7 +72,9 @@ public:
|
|||||||
enableTemperature,
|
enableTemperature,
|
||||||
enableEnergy,
|
enableEnergy,
|
||||||
BlackoilIndices::gasEnabled,
|
BlackoilIndices::gasEnabled,
|
||||||
|
enableEvaporation,
|
||||||
enableBrine,
|
enableBrine,
|
||||||
|
enableSaltPrecipitation,
|
||||||
BlackoilIndices::numPhases>
|
BlackoilIndices::numPhases>
|
||||||
FluidState;
|
FluidState;
|
||||||
|
|
||||||
|
@ -112,6 +112,8 @@ public:
|
|||||||
static constexpr bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
|
static constexpr bool has_polymermw = getPropValue<TypeTag, Properties::EnablePolymerMW>();
|
||||||
static constexpr bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
|
static constexpr bool has_foam = getPropValue<TypeTag, Properties::EnableFoam>();
|
||||||
static constexpr bool has_brine = getPropValue<TypeTag, Properties::EnableBrine>();
|
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>();
|
static constexpr bool has_micp = getPropValue<TypeTag, Properties::EnableMICP>();
|
||||||
|
|
||||||
// For the conversion between the surface volume rate and reservoir voidage rate
|
// For the conversion between the surface volume rate and reservoir voidage rate
|
||||||
@ -120,7 +122,9 @@ public:
|
|||||||
has_temperature,
|
has_temperature,
|
||||||
has_energy,
|
has_energy,
|
||||||
Indices::compositionSwitchIdx >= 0,
|
Indices::compositionSwitchIdx >= 0,
|
||||||
|
has_watVapor,
|
||||||
has_brine,
|
has_brine,
|
||||||
|
has_saltPrecip,
|
||||||
Indices::numPhases >;
|
Indices::numPhases >;
|
||||||
/// Constructor
|
/// Constructor
|
||||||
WellInterface(const Well& well,
|
WellInterface(const Well& well,
|
||||||
|
Loading…
Reference in New Issue
Block a user