mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-26 03:00:17 -06:00
Merge pull request #717 from hnil/cpr_analytic
made definition of model fluid,indices and primaryvariables public
This commit is contained in:
commit
bc6e4ffa26
@ -271,16 +271,18 @@ template<class TypeTag >
|
||||
class BlackOilModel
|
||||
: 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 ParentType = MultiPhaseBaseModel<TypeTag>;
|
||||
|
||||
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 Discretization = GetPropType<TypeTag, Properties::Discretization>;
|
||||
using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
|
||||
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
|
||||
|
||||
enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
|
||||
enum { numComponents = FluidSystem::numComponents };
|
||||
|
Loading…
Reference in New Issue
Block a user