add flags to Propertities

add flags to Propertities

add flags to Propertities
This commit is contained in:
goncalvesmachadoc 2021-11-29 16:11:23 +01:00
parent 22cabb6855
commit db3ef09fc0
2 changed files with 9 additions and 1 deletions

View File

@ -84,6 +84,8 @@ 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 { enableSaltPrecipitation = getPropValue<TypeTag, Properties::EnableSaltPrecipitation>() };
enum { enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>() };
enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
enum { enableDiffusion = getPropValue<TypeTag, Properties::EnableDiffusion>() };
@ -107,7 +109,7 @@ class BlackOilIntensiveQuantities
using Toolbox = MathToolbox<Evaluation>;
using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
using FluxIntensiveQuantities = typename FluxModule::FluxIntensiveQuantities;
using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled, enableBrine, Indices::numPhases >;
using FluidState = BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled, enableEvaporation, enableBrine, enableSaltPrecipitation, Indices::numPhases >;
using DiffusionIntensiveQuantities = BlackOilDiffusionIntensiveQuantities<TypeTag, enableDiffusion>;
public:

View File

@ -58,6 +58,12 @@ struct EnableFoam { using type = UndefinedProperty; };
//! Enable the ECL-blackoil extension for salt
template<class TypeTag, class MyTypeTag>
struct EnableBrine { using type = UndefinedProperty; };
//! Enable the ECL-blackoil extension for salt precipitation
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; };
//! Enable the ECL-blackoil extension for MICP.
template<class TypeTag, class MyTypeTag>
struct EnableMICP { using type = UndefinedProperty; };