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

fix various extentions

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-01-09 12:51:38 +01:00
parent 56d7a1ec19
commit ada7c9d90b
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ebos/ebos_gasoil.cc
View File

@ -48,6 +48,7 @@ public:
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
GET_PROP_VALUE(TypeTag, EnableBrine),
/*PVOffset=*/0, /*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::waterCompIdx> type; /*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
}; };

1
ebos/ebos_oilwater.cc
View File

@ -48,6 +48,7 @@ public:
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
GET_PROP_VALUE(TypeTag, EnableBrine),
/*PVOffset=*/0, /*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type; /*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
}; };

1
ebos/ebos_oilwaterpolymer.cc
View File

@ -50,6 +50,7 @@ public:
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
GET_PROP_VALUE(TypeTag, EnableBrine),
/*PVOffset=*/0, /*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type; /*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
}; };

3
flow/flow_onephase.cpp
View File

@ -42,6 +42,7 @@ public:
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
GET_PROP_VALUE(TypeTag, EnableBrine),
/*PVOffset=*/0, /*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx> /*enebledCompIdx=*/FluidSystem::waterCompIdx>
type; type;
@ -54,6 +55,7 @@ private:
enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) }; enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
enum { enableSolvent = GET_PROP_VALUE(TypeTag, EnableSolvent) }; enum { enableSolvent = GET_PROP_VALUE(TypeTag, EnableSolvent) };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) }; enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
enum { enableBrine = GET_PROP_VALUE(TypeTag, EnableBrine) };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) }; enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
@ -66,6 +68,7 @@ public:
enableTemperature, enableTemperature,
enableEnergy, enableEnergy,
compositionSwitchEnabled, compositionSwitchEnabled,
enableBrine,
Indices::numPhases> Indices::numPhases>
type; type;
}; };

3
flow/flow_onephase_energy.cpp
View File

@ -43,6 +43,7 @@ public:
GET_PROP_VALUE(TypeTag, EnablePolymer), GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam), GET_PROP_VALUE(TypeTag, EnableFoam),
GET_PROP_VALUE(TypeTag, EnableBrine),
/*PVOffset=*/0, /*PVOffset=*/0,
/*enebledCompIdx=*/FluidSystem::waterCompIdx> /*enebledCompIdx=*/FluidSystem::waterCompIdx>
type; type;
@ -55,6 +56,7 @@ private:
enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) }; enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
enum { enableSolvent = GET_PROP_VALUE(TypeTag, EnableSolvent) }; enum { enableSolvent = GET_PROP_VALUE(TypeTag, EnableSolvent) };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) }; enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
enum { enableBrine = GET_PROP_VALUE(TypeTag, EnableBrine) };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) }; enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
@ -67,6 +69,7 @@ public:
enableTemperature, enableTemperature,
enableEnergy, enableEnergy,
compositionSwitchEnabled, compositionSwitchEnabled,
enableBrine,
Indices::numPhases> Indices::numPhases>
type; type;
}; };