changed: remove GET_PROP_TYPE / GET_PROP macro usage

ebos/ebos_altidx.cc

@@ -58,7 +58,7 @@ NEW_TYPE_TAG(EbosAltIdxTypeTag, INHERITS_FROM(EbosTypeTag));
 // use a fluid system with different indices than the default
 SET_PROP(EbosAltIdxTypeTag, FluidSystem)
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
     typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type;

ebos/ebos_blackoil.cc

@@ -53,7 +53,7 @@ bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
 std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
 {
     using ProblemTypeTag = Properties::TTag::EbosTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
     // the work
@@ -73,7 +73,7 @@ std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
 std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv)
 {
     using ProblemTypeTag = Properties::TTag::EbosTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     // use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
     // the work
@@ -95,7 +95,7 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
                          double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_brine.cc

@@ -47,7 +47,7 @@ void ebosBrineSetDeck(Opm::Deck* deck,
                      double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosBrineTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_foam.cc

@@ -47,7 +47,7 @@ void ebosFoamSetDeck(Opm::Deck* deck,
                      double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosFoamTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_gasoil.cc

@@ -41,7 +41,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -63,7 +63,7 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
                        double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosGasOilTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_oilwater.cc

@@ -41,7 +41,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -63,7 +63,7 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
                          double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosOilWaterTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_oilwaterpolymer.cc

@@ -43,7 +43,7 @@ private:
     // it is unfortunately not possible to simply use 'TypeTag' here because this leads
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
-    typedef typename GET_PROP_TYPE(TTag::EbosTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TTag::EbosTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -65,7 +65,7 @@ void ebosOilWaterPolymerSetDeck(Opm::Deck* deck,
                                 double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosOilWaterPolymerTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_polymer.cc

@@ -47,7 +47,7 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
                         double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosPolymerTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_solvent.cc

@@ -47,7 +47,7 @@ void ebosSolventSetDeck(Opm::Deck* deck,
                         double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosSolventTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/ebos_thermal.cc

@@ -47,7 +47,7 @@ void ebosThermalSetDeck(Opm::Deck* deck,
                         double externalSetupTime)
 {
     using ProblemTypeTag = Properties::TTag::EbosThermalTypeTag;
-    typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<ProblemTypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(externalSetupTime);
     Vanguard::setExternalParseContext(parseContext);

ebos/eclalugridvanguard.hh

@@ -66,13 +66,13 @@ class EclAluGridVanguard : public EclBaseVanguard<TypeTag>
     friend class EclBaseVanguard<TypeTag>;
     typedef EclBaseVanguard<TypeTag> ParentType;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid;
+    using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
 private:
     typedef Opm::AluCartesianIndexMapper<Grid> CartesianIndexMapper;

ebos/eclbaseaquifermodel.hh

@@ -48,8 +48,8 @@ namespace Opm {
 template <class TypeTag>
 class EclBaseAquiferModel
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
 public:
     EclBaseAquiferModel(Simulator& simulator)

ebos/eclbasevanguard.hh

@@ -100,16 +100,16 @@ namespace Opm {
 template <class TypeTag>
 class EclBaseVanguard : public BaseVanguard<TypeTag>
 {
-    typedef BaseVanguard<TypeTag> ParentType;
+    using ParentType = BaseVanguard<TypeTag>;
-    typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Vanguard>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
     enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) };
 
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
 protected:
     static const int dimension = Grid::dimension;

ebos/eclcpgridvanguard.hh

@@ -54,7 +54,7 @@ NEW_TYPE_TAG(EclCpGridVanguard, INHERITS_FROM(EclBaseVanguard));
 // declare the properties
 SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Opm::EclCpGridVanguard<TypeTag>);
 SET_TYPE_PROP(EclCpGridVanguard, Grid, Dune::CpGrid);
-SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid));
+SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, GetPropType<TypeTag, Properties::Grid>);
 
 } // namespace Opm::Properties
 
@@ -73,14 +73,14 @@ class EclCpGridVanguard : public EclBaseVanguard<TypeTag>
     friend class EclBaseVanguard<TypeTag>;
     typedef EclBaseVanguard<TypeTag> ParentType;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
+    using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
 
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid;
+    using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
 private:
     typedef Dune::CartesianIndexMapper<Grid> CartesianIndexMapper;

ebos/ecldummygradientcalculator.hh

@@ -48,10 +48,9 @@ namespace Opm {
 template<class TypeTag>
 class EclDummyGradientCalculator
 {
-
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
 
     enum { dimWorld = GridView::dimensionworld };
 

ebos/eclequilinitializer.hh

@@ -53,12 +53,12 @@ namespace Opm {
 template <class TypeTag>
 class EclEquilInitializer
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };

ebos/eclfluxmodule.hh

@@ -86,7 +86,7 @@ class EclTransBaseProblem
 template <class TypeTag>
 class EclTransIntensiveQuantities
 {
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 protected:
     void update_(const ElementContext& elemCtx OPM_UNUSED, unsigned dofIdx OPM_UNUSED, unsigned timeIdx OPM_UNUSED)
     { }
@@ -99,14 +99,14 @@ protected:
 template <class TypeTag>
 class EclTransExtensiveQuantities
 {
-    typedef typename GET_PROP_TYPE(TypeTag, ExtensiveQuantities) Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };

ebos/eclnewtonmethod.hh

@@ -54,18 +54,18 @@ template <class TypeTag>
 class EclNewtonMethod : public BlackOilNewtonMethod<TypeTag>
 {
     typedef BlackOilNewtonMethod<TypeTag> ParentType;
-    typedef typename GET_PROP_TYPE(TypeTag, DiscNewtonMethod) DiscNewtonMethod;
+    using DiscNewtonMethod = GetPropType<TypeTag, Properties::DiscNewtonMethod>;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef typename GET_PROP_TYPE(TypeTag, EqVector) EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Linearizer) Linearizer;
+    using Linearizer = GetPropType<TypeTag, Properties::Linearizer>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
     static const unsigned numEq = GET_PROP_VALUE(TypeTag, NumEq);
 

ebos/ecloutputblackoilmodule.hh

@@ -70,18 +70,17 @@ class EcfvDiscretization;
 template <class TypeTag>
 class EclOutputBlackOilModule
 {
-
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Discretization = GetPropType<TypeTag, Properties::Discretization>;
-    typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using Element = typename GridView::template Codim<0>::Entity;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using ElementIterator = typename GridView::template Codim<0>::Iterator;
-    typedef typename GridView::template Codim<0>::Iterator ElementIterator;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };

ebos/eclpeacemanwell.hh

@@ -73,22 +73,22 @@ class EcfvDiscretization;
 template <class TypeTag>
 class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag>
 {
-    typedef BaseAuxiliaryModule<TypeTag> AuxModule;
+    using AuxModule = BaseAuxiliaryModule<TypeTag>;
 
-    typedef typename AuxModule::NeighborSet NeighborSet;
+    using NeighborSet = typename AuxModule::NeighborSet;
-    typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+    using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
-    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization;
+    using Discretization = GetPropType<TypeTag, Properties::Discretization>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     typedef Opm::MathToolbox<Evaluation> Toolbox;
 
@@ -115,8 +115,8 @@ class EclPeacemanWell : public BaseAuxiliaryModule<TypeTag>
     static const unsigned gasCompIdx = FluidSystem::gasCompIdx;
 
     static const unsigned numModelEq = GET_PROP_VALUE(TypeTag, NumEq);
-    static const unsigned conti0EqIdx = GET_PROP_TYPE(TypeTag, Indices)::conti0EqIdx;
+    static const unsigned conti0EqIdx = GetPropType<TypeTag, Properties::Indices>::conti0EqIdx;
-    static const unsigned contiEnergyEqIdx = GET_PROP_TYPE(TypeTag, Indices)::contiEnergyEqIdx;
+    static const unsigned contiEnergyEqIdx = GetPropType<TypeTag, Properties::Indices>::contiEnergyEqIdx;
 
     static constexpr unsigned historySize = GET_PROP_VALUE(TypeTag, TimeDiscHistorySize);
 

ebos/eclpolyhedralgridvanguard.hh

@@ -44,7 +44,7 @@ NEW_TYPE_TAG(EclPolyhedralGridVanguard, INHERITS_FROM(EclBaseVanguard));
 // declare the properties
 SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Opm::EclPolyhedralGridVanguard<TypeTag>);
 SET_TYPE_PROP(EclPolyhedralGridVanguard, Grid, Dune::PolyhedralGrid<3, 3>);
-SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid));
+SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, GetPropType<TypeTag, Properties::Grid>);
 
 } // namespace Opm::Properties
 
@@ -63,13 +63,13 @@ class EclPolyhedralGridVanguard : public EclBaseVanguard<TypeTag>
     friend class EclBaseVanguard<TypeTag>;
     typedef EclBaseVanguard<TypeTag> ParentType;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid;
+    using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
 private:
     typedef Grid* GridPointer;

ebos/eclproblem.hh

@@ -176,8 +176,8 @@ SET_TAG_PROP(EclBaseProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 SET_PROP(EclBaseProblem, MaterialLaw)
 {
 private:
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     typedef Opm::ThreePhaseMaterialTraits<Scalar,
                                           /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
@@ -194,8 +194,8 @@ public:
 SET_PROP(EclBaseProblem, SolidEnergyLaw)
 {
 private:
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager;
@@ -207,8 +207,8 @@ public:
 SET_PROP(EclBaseProblem, ThermalConductionLaw)
 {
 private:
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::EclThermalLawManager<Scalar, FluidSystem> EclThermalLawManager;
@@ -221,8 +221,8 @@ public:
 SET_PROP(EclBaseProblem, Stencil)
 {
 private:
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
 public:
     typedef Opm::EcfvStencil<Scalar,
@@ -386,17 +386,17 @@ namespace Opm {
  *        commercial ECLiPSE simulator.
  */
 template <class TypeTag>
-class EclProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
+class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef typename GET_PROP_TYPE(TypeTag, BaseProblem) ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
-    typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Problem>;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Stencil) Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, EqVector) EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
 
 
     // Grid and world dimension
@@ -424,24 +424,24 @@ class EclProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
     enum { oilCompIdx = FluidSystem::oilCompIdx };
     enum { waterCompIdx = FluidSystem::waterCompIdx };
 
-    typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager EclMaterialLawManager;
+    using EclMaterialLawManager = typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager;
-    typedef typename GET_PROP(TypeTag, SolidEnergyLaw)::EclThermalLawManager EclThermalLawManager;
+    using EclThermalLawManager = typename GET_PROP(TypeTag, SolidEnergyLaw)::EclThermalLawManager;
-    typedef typename EclMaterialLawManager::MaterialLawParams MaterialLawParams;
+    using MaterialLawParams = typename EclMaterialLawManager::MaterialLawParams;
-    typedef typename EclThermalLawManager::SolidEnergyLawParams SolidEnergyLawParams;
+    using SolidEnergyLawParams = typename EclThermalLawManager::SolidEnergyLawParams;
-    typedef typename EclThermalLawManager::ThermalConductionLawParams ThermalConductionLawParams;
+    using ThermalConductionLawParams = typename EclThermalLawManager::ThermalConductionLawParams;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef typename GET_PROP_TYPE(TypeTag, DofMapper) DofMapper;
+    using DofMapper = GetPropType<TypeTag, Properties::DofMapper>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef typename GET_PROP_TYPE(TypeTag, EclWellModel) EclWellModel;
+    using EclWellModel = GetPropType<TypeTag, Properties::EclWellModel>;
-    typedef typename GET_PROP_TYPE(TypeTag, EclAquiferModel) EclAquiferModel;
+    using EclAquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
 
     typedef BlackOilSolventModule<TypeTag> SolventModule;
     typedef BlackOilPolymerModule<TypeTag> PolymerModule;

ebos/eclthresholdpressure.hh

@@ -64,11 +64,11 @@ namespace Opm {
 template <class TypeTag>
 class EclThresholdPressure
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) };
     enum { numPhases = FluidSystem::numPhases };

ebos/ecltracermodel.hh

@@ -60,15 +60,15 @@ namespace Opm {
 template <class TypeTag>
 class EclTracerModel
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Stencil) Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     typedef Opm::DenseAd::Evaluation<Scalar,1> TracerEvaluation;
 

ebos/ecltransmissibility.hh

@@ -66,12 +66,12 @@ namespace Opm {
 template <class TypeTag>
 class EclTransmissibility
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
+    using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
-    typedef typename GridView::Intersection Intersection;
+    using Intersection = typename GridView::Intersection;
 
     static const bool enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy);
 

ebos/eclwellmanager.hh

@@ -65,14 +65,14 @@ namespace Opm {
 template <class TypeTag>
 class EclWellManager
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
     enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
     enum { numPhases = FluidSystem::numPhases };

ebos/eclwriter.hh

@@ -149,16 +149,16 @@ bool directVerticalNeighbors(const std::array<int, 3>& cartDims,
 template <class TypeTag>
 class EclWriter
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid;
+    using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
-    typedef typename GridView::template Codim<0>::Iterator ElementIterator;
+    using ElementIterator = typename GridView::template Codim<0>::Iterator;
 
     typedef CollectDataToIORank<Vanguard> CollectDataToIORankType;
 

ebos/equil/initstateequil.hh

@@ -1571,9 +1571,9 @@ equilnum(const Opm::EclipseState& eclipseState,
 template<class TypeTag>
 class InitialStateComputer
 {
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
 
 public:
     template<class MaterialLawManager>

ebos/vtkecltracermodule.hh

@@ -64,13 +64,13 @@ namespace Opm {
     {
         typedef BaseOutputModule<TypeTag> ParentType;
 
-        typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+        using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-        typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+        using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-        typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+        using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-        typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+        using GridView = GetPropType<TypeTag, Properties::GridView>;
-        typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+        using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
         static const int vtkFormat = GET_PROP_VALUE(TypeTag, VtkOutputFormat);
         typedef Opm::VtkMultiWriter<GridView, vtkFormat> VtkMultiWriter;

flow/flow_blackoil_dunecpr.cpp

@@ -44,9 +44,8 @@ namespace Opm {
     SET_PROP(EclFlowProblemSimple, FluidSystem)
     {
     private:
-      //typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+      using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-      typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+      using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-      typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
 
     public:
         typedef Opm::BlackOilFluidSystem<Scalar> type;

flow/flow_ebos_blackoil.cpp

@@ -37,7 +37,7 @@ namespace Opm {
 void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_brine.cpp

@@ -39,7 +39,7 @@ namespace Opm {
 void flowEbosBrineSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowBrineProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_energy.cpp

@@ -39,7 +39,7 @@ namespace Opm {
 void flowEbosEnergySetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowEnergyProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_foam.cpp

@@ -39,7 +39,7 @@ namespace Opm {
 void flowEbosFoamSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowFoamProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_gasoil.cpp

@@ -46,7 +46,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -63,7 +63,7 @@ namespace Opm {
 void flowEbosGasOilSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowGasOilProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_oilwater.cpp

@@ -46,7 +46,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -63,7 +63,7 @@ namespace Opm {
 void flowEbosOilWaterSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowOilWaterProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_oilwater_brine.cpp

@@ -46,7 +46,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -63,7 +63,7 @@ namespace Opm {
 void flowEbosOilWaterBrineSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_oilwater_polymer.cpp

@@ -47,7 +47,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
@@ -64,7 +64,7 @@ namespace Opm {
 void flowEbosOilWaterPolymerSetDeck(double setupTime, Deck* deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_oilwater_polymer_injectivity.cpp

@@ -49,7 +49,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilTwoPhaseIndices<0,
@@ -66,7 +66,7 @@ namespace Opm {
 /* void flowEbosOilWaterPolymerInjectivitySetDeck(Deck& deck, EclipseState& eclState)
 {
     using TypeTag = Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalDeck(&deck, &eclState);
 } */

flow/flow_ebos_polymer.cpp

@@ -39,7 +39,7 @@ namespace Opm {
 void flowEbosPolymerSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowPolymerProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_ebos_solvent.cpp

@@ -39,7 +39,7 @@ namespace Opm {
 void flowEbosSolventSetDeck(double setupTime, Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowSolventProblem;
-    typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
     Vanguard::setExternalSetupTime(setupTime);
     Vanguard::setExternalDeck(deck);

flow/flow_onephase.cpp

@@ -34,7 +34,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),

flow/flow_onephase_energy.cpp

@@ -34,7 +34,7 @@ private:
     // to cyclic definitions of some properties. if this happens the compiler error
     // messages unfortunately are *really* confusing and not really helpful.
     using BaseTypeTag = TTag::EclFlowProblem;
-    typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<BaseTypeTag, Properties::FluidSystem>;
 
 public:
     typedef Opm::BlackOilOnePhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),

opm/simulators/aquifers/AquiferInterface.hpp

@@ -44,12 +44,12 @@ template <typename TypeTag>
 class AquiferInterface
 {
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices;
+    using BlackoilIndices = GetPropType<TypeTag, Properties::Indices>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
     enum { enableTemperature = GET_PROP_VALUE(TypeTag, EnableTemperature) };
     enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };

opm/simulators/aquifers/BlackoilAquiferModel.hpp

@@ -46,8 +46,8 @@ namespace Opm
 template <typename TypeTag>
 class BlackoilAquiferModel
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
 public:
     explicit BlackoilAquiferModel(Simulator& simulator);
@@ -73,8 +73,8 @@ public:
 
 protected:
     // ---------      Types      ---------
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
     typedef AquiferCarterTracy<TypeTag> AquiferCarterTracy_object;
     typedef AquiferFetkovich<TypeTag> AquiferFetkovich_object;

opm/simulators/flow/BlackoilModelEbos.hpp

@@ -109,16 +109,16 @@ namespace Opm {
         typedef WellStateFullyImplicitBlackoil WellState;
         typedef BlackoilModelParametersEbos<TypeTag> ModelParameters;
 
-        typedef typename GET_PROP_TYPE(TypeTag, Simulator)         Simulator;
+        using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-        typedef typename GET_PROP_TYPE(TypeTag, Grid)              Grid;
+        using Grid = GetPropType<TypeTag, Properties::Grid>;
-        typedef typename GET_PROP_TYPE(TypeTag, ElementContext)    ElementContext;
+        using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-        typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+        using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
-        typedef typename GET_PROP_TYPE(TypeTag, SolutionVector)    SolutionVector ;
+        using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-        typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables)  PrimaryVariables ;
+        using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-        typedef typename GET_PROP_TYPE(TypeTag, FluidSystem)       FluidSystem;
+        using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-        typedef typename GET_PROP_TYPE(TypeTag, Indices)           Indices;
+        using Indices = GetPropType<TypeTag, Properties::Indices>;
-        typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)       MaterialLaw;
+        using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-        typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+        using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
         typedef double Scalar;
         static const int numEq = Indices::numEq;

opm/simulators/flow/BlackoilModelParametersEbos.hpp

@@ -104,7 +104,7 @@ namespace Opm
     struct BlackoilModelParametersEbos
     {
     private:
-        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
     public:
         /// Max relative change in bhp in single iteration.

opm/simulators/flow/FlowMainEbos.hpp

@@ -70,12 +70,12 @@ namespace Opm
     {
     public:
         typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
-        typedef typename GET_PROP_TYPE(TypeTag, Simulator) EbosSimulator;
+        using EbosSimulator = GetPropType<TypeTag, Properties::Simulator>;
-        typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+        using Grid = GetPropType<TypeTag, Properties::Grid>;
-        typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+        using GridView = GetPropType<TypeTag, Properties::GridView>;
-        typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+        using Problem = GetPropType<TypeTag, Properties::Problem>;
-        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-        typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+        using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
         typedef Opm::SimulatorFullyImplicitBlackoilEbos<TypeTag> Simulator;
 
@@ -419,7 +419,7 @@ namespace Opm
                 omp_set_num_threads(std::min(2, omp_get_num_procs()));
 #endif
 
-            typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager;
+            using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
             ThreadManager::init();
         }
 

opm/simulators/flow/Main.hpp

@@ -80,7 +80,7 @@ namespace Opm {
   template <class TypeTag>
   void flowEbosSetDeck(Deck *deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig)
   {
-    using Vanguard = typename GET_PROP_TYPE(TypeTag, Vanguard);
+    using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
     Vanguard::setExternalDeck(deck);
     Vanguard::setExternalEclState(&eclState);
     Vanguard::setExternalSchedule(&schedule);
@@ -341,7 +341,7 @@ namespace Opm
             // simulator object. (Which parses the parameters again, but since this is done in an
             // identical manner it does not matter.)
             typedef TypeTagEarlyBird PreTypeTag;
-            typedef typename GET_PROP_TYPE(PreTypeTag, Problem) PreProblem;
+            using PreProblem = GetPropType<PreTypeTag, Properties::Problem>;
 
             PreProblem::setBriefDescription("Flow, an advanced reservoir simulator for ECL-decks provided by the Open Porous Media project.");
             int status = Opm::FlowMainEbos<PreTypeTag>::setupParameters_(argc_, argv_);
@@ -374,7 +374,7 @@ namespace Opm
                 deckFilename = EWOMS_GET_PARAM(PreTypeTag, std::string, EclDeckFileName);
             }
 
-            typedef typename GET_PROP_TYPE(PreTypeTag, Vanguard) PreVanguard;
+            using PreVanguard = GetPropType<PreTypeTag, Properties::Vanguard>;
             try {
                 deckFilename = PreVanguard::canonicalDeckPath(deckFilename).string();
             }

opm/simulators/flow/NonlinearSolverEbos.hpp

@@ -58,7 +58,7 @@ namespace Opm {
     template <class TypeTag, class PhysicalModel>
     class NonlinearSolverEbos
     {
-        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
     public:
         // Available relaxation scheme types.

opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -53,15 +53,15 @@ template<class TypeTag>
 class SimulatorFullyImplicitBlackoilEbos
 {
 public:
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices;
+    using BlackoilIndices = GetPropType<TypeTag, Properties::Indices>;
-    typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables)  PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef typename GET_PROP_TYPE(TypeTag, SolutionVector)    SolutionVector ;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
     typedef AdaptiveTimeSteppingEbos<TypeTag> TimeStepper;
     typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule;

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -66,7 +66,7 @@ struct EclWellModel;
 SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
 {
 private:
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
     typedef Opm::MatrixBlock<Scalar, numEq, numEq> Block;
 
@@ -97,21 +97,21 @@ DenseMatrix transposeDenseMatrix(const DenseMatrix& M)
     class ISTLSolverEbos
     {
     protected:
-        typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+        using GridView = GetPropType<TypeTag, Properties::GridView>;
-        typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+        using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-        typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+        using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
-        typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector;
+        using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-        typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+        using Indices = GetPropType<TypeTag, Properties::Indices>;
-        typedef typename GET_PROP_TYPE(TypeTag, EclWellModel) WellModel;
+        using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
-        typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+        using Simulator = GetPropType<TypeTag, Properties::Simulator>;
         typedef typename SparseMatrixAdapter::IstlMatrix Matrix;
 
         typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType;
         typedef typename Vector::block_type BlockVector;
-        typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+        using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-        typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager;
+        using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
         typedef typename GridView::template Codim<0>::Entity Element;
-        typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+        using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
         using FlexibleSolverType = Dune::FlexibleSolver<Matrix, Vector>;
         using AbstractOperatorType = Dune::AssembledLinearOperator<Matrix, Vector, Vector>;
         using WellModelOperator = WellModelAsLinearOperator<WellModel, Vector, Vector>;

opm/simulators/linalg/ISTLSolverEbosFlexible.hpp

@@ -55,13 +55,13 @@ namespace Opm
 template <class TypeTag>
 class ISTLSolverEbosFlexible
 {
-    using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    using SparseMatrixAdapter = typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter);
+    using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
-    using VectorType = typename GET_PROP_TYPE(TypeTag, GlobalEqVector);
+    using VectorType = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    using Simulator = typename GET_PROP_TYPE(TypeTag, Simulator);
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using MatrixType = typename SparseMatrixAdapter::IstlMatrix;
-    using WellModel = typename GET_PROP_TYPE(TypeTag, EclWellModel);
+    using WellModel = GetPropType<TypeTag, Properties::EclWellModel>;
 #if HAVE_MPI
     using Communication = Dune::OwnerOverlapCopyCommunication<int, int>;
 #else
@@ -72,16 +72,15 @@ class ISTLSolverEbosFlexible
     using SolverType = Dune::FlexibleSolver<MatrixType, VectorType>;
 
     // for quasiImpesWeights
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector;
+    using Vector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     typedef typename SparseMatrixAdapter::IstlMatrix Matrix;
     typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType;
     typedef typename Vector::block_type BlockVector;
-    typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager;
+    using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
     typedef typename GridView::template Codim<0>::Entity Element;
-    typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-
 
 public:
     static void registerParameters()

opm/simulators/wells/BlackoilWellModel.hpp

@@ -78,15 +78,15 @@ namespace Opm {
             typedef WellStateFullyImplicitBlackoil WellState;
             typedef BlackoilModelParametersEbos<TypeTag> ModelParameters;
 
-            typedef typename GET_PROP_TYPE(TypeTag, Grid)                Grid;
+            using Grid = GetPropType<TypeTag, Properties::Grid>;
-            typedef typename GET_PROP_TYPE(TypeTag, FluidSystem)         FluidSystem;
+            using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-            typedef typename GET_PROP_TYPE(TypeTag, ElementContext)      ElementContext;
+            using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-            typedef typename GET_PROP_TYPE(TypeTag, Indices)             Indices;
+            using Indices = GetPropType<TypeTag, Properties::Indices>;
-            typedef typename GET_PROP_TYPE(TypeTag, Simulator)           Simulator;
+            using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-            typedef typename GET_PROP_TYPE(TypeTag, Scalar)              Scalar;
+            using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-            typedef typename GET_PROP_TYPE(TypeTag, RateVector)          RateVector;
+            using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-            typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector)      GlobalEqVector;
+            using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-            typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+            using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
 
             typedef typename Opm::BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;
 

opm/simulators/wells/WellConnectionAuxiliaryModule.hpp

@@ -33,8 +33,8 @@ template<class TypeTag>
 class WellConnectionAuxiliaryModule
     : public Opm::BaseAuxiliaryModule<TypeTag>
 {
-    typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+    using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
 
 public:
 

opm/simulators/wells/WellInterface.hpp

@@ -74,14 +74,14 @@ namespace Opm
         static const int Oil = BlackoilPhases::Liquid;
         static const int Gas = BlackoilPhases::Vapour;
 
-        typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+        using Grid = GetPropType<TypeTag, Properties::Grid>;
-        typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+        using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-        typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+        using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-        typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+        using Indices = GetPropType<TypeTag, Properties::Indices>;
-        typedef typename GET_PROP_TYPE(TypeTag, IntensiveQuantities) IntensiveQuantities;
+        using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-        typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+        using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-        typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
+        using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
-        typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
+        using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
         static const int numEq = Indices::numEq;
         typedef double Scalar;

tests/test_ecl_output.cc

@@ -105,10 +105,10 @@ double ecl_sum_get_general_var(const Opm::EclIO::ESmry* smry,
 }
 
 template <class TypeTag>
-std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)>
+std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
 initSimulator(const char *filename)
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
 
     std::string filenameArg = "--ecl-deck-file-name=";
     filenameArg += filename;
@@ -130,7 +130,7 @@ void test_summary()
     const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
 
     auto simulator = initSimulator<TypeTag>(filename.data());
-    typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
+    using Vanguard = Opm::GetPropType<TypeTag, Opm::Properties::Vanguard>;
     typedef Opm::CollectDataToIORank< Vanguard > CollectDataToIORankType;
     CollectDataToIORankType collectToIORank(simulator->vanguard());
     Opm::EclOutputBlackOilModule<TypeTag> eclOutputModule(*simulator, collectToIORank);

tests/test_equil.cc

@@ -77,10 +77,10 @@ NEW_TYPE_TAG(TestEquilTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
 END_PROPERTIES
 
 template <class TypeTag>
-std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)>
+std::unique_ptr<Opm::GetPropType<TypeTag, Opm::Properties::Simulator>>
 initSimulator(const char *filename)
 {
-    typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
+    using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
 
     std::string filenameArg = "--ecl-deck-file-name=";
     filenameArg += filename;
@@ -98,7 +98,7 @@ initSimulator(const char *filename)
 template <class TypeTag>
 static void initDefaultFluidSystem()
 {
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
 
     std::vector<std::pair<double, double> > Bo = {
         { 101353, 1. },
@@ -180,7 +180,7 @@ void test_PhasePressure()
     const auto record = mkEquilRecord( 0, 1e5, 5, 0, 0, 0 );
 
     using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
-    using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
 
     using TabulatedFunction = Opm::Tabulated1DFunction<double>;
     std::vector<double> x = {0.0,100.0};
@@ -229,7 +229,7 @@ void test_CellSubset()
     using PVal        = std::vector<double>;
     using PPress      = std::vector<PVal>;
     using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
-    using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
 
     auto simulator = initSimulator<TypeTag>("equil_base.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
@@ -340,7 +340,7 @@ void test_RegMapping()
     using PVal        = std::vector<double>;
     using PPress      = std::vector<PVal>;
     using TypeTag     = Opm::Properties::TTag::TestEquilTypeTag;
-    using FluidSystem = GET_PROP_TYPE(TypeTag, FluidSystem);
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
 
     auto simulator = initSimulator<TypeTag>("equil_base.DATA");
     initDefaultFluidSystem<TypeTag>();
@@ -440,7 +440,7 @@ void test_RegMapping()
 void test_DeckAllDead()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -466,9 +466,10 @@ void test_CapillaryInversion()
 {
     // Test setup.
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
-    typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+    using MaterialLaw = Opm::GetPropType<TypeTag, Opm::Properties::MaterialLaw>;
-    typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
+    using MaterialLawManager = typename Opm::GetProp<TypeTag, Opm::Properties::MaterialLaw>::EclMaterialLawManager;
+
     auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
 
     // Test the capillary inversion for oil-water.
@@ -516,7 +517,7 @@ void test_CapillaryInversion()
 void test_DeckWithCapillary()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
     auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -554,7 +555,7 @@ void test_DeckWithCapillary()
 void test_DeckWithCapillaryOverlap()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -612,7 +613,7 @@ void test_DeckWithCapillaryOverlap()
 void test_DeckWithLiveOil()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -688,7 +689,7 @@ void test_DeckWithLiveOil()
 void test_DeckWithLiveGas()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_livegas.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -766,7 +767,7 @@ void test_DeckWithLiveGas()
 void test_DeckWithRSVDAndRVVD()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
@@ -864,7 +865,7 @@ void test_DeckWithRSVDAndRVVD()
 void test_DeckWithPBVDAndPDVD()
 {
     using TypeTag = Opm::Properties::TTag::TestEquilTypeTag;
-    typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+    using FluidSystem = Opm::GetPropType<TypeTag, Opm::Properties::FluidSystem>;
     auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());