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

Merge pull request #717 from hnil/cpr_analytic

Browse Source 
made definition of model fluid,indices and primaryvariables public
This commit is contained in:
Atgeirr Flø Rasmussen 2022-09-21 09:12:03 +02:00 committed by GitHub
commit bc6e4ffa26
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/models/blackoil/blackoilmodel.hh
View File

@ -271,16 +271,18 @@ template<class TypeTag >
class BlackOilModel class BlackOilModel
: public MultiPhaseBaseModel<TypeTag> : public MultiPhaseBaseModel<TypeTag>
{ {
public:
using Indices = GetPropType<TypeTag, Properties::Indices>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
private:
using Implementation = GetPropType<TypeTag, Properties::Model>; using Implementation = GetPropType<TypeTag, Properties::Model>;
using ParentType = MultiPhaseBaseModel<TypeTag>; using ParentType = MultiPhaseBaseModel<TypeTag>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using Indices = GetPropType<TypeTag, Properties::Indices>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
using Simulator = GetPropType<TypeTag, Properties::Simulator>; using Simulator = GetPropType<TypeTag, Properties::Simulator>;
using Discretization = GetPropType<TypeTag, Properties::Discretization>; using Discretization = GetPropType<TypeTag, Properties::Discretization>;
using ElementContext = GetPropType<TypeTag, Properties::ElementContext>; using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() }; enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
enum { numComponents = FluidSystem::numComponents }; enum { numComponents = FluidSystem::numComponents };