[cleanup] replace typedef by using

examples/art2dgf.cpp

@@ -50,8 +50,8 @@ namespace Ewoms {
                          std::ostream& dgfFile,
                          const unsigned precision = 16 )
     {
-        typedef double Scalar;
+        using Scalar = double;
-        typedef Dune::FieldVector< Scalar, 2 > GlobalPosition;
+        using GlobalPosition = Dune::FieldVector< Scalar, 2 >;
         enum ParseMode { Vertex, Edge, Element, Finished };
         std::vector< std::pair<GlobalPosition, unsigned> > vertexPos;
         std::vector<std::pair<unsigned, unsigned> > edges;

examples/co2injection_flash_ecfv.cpp

@@ -81,6 +81,6 @@ struct NewtonTolerance<TypeTag, TTag::Co2InjectionFlashEcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionFlashEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionFlashEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_ni_ecfv.cpp

@@ -81,6 +81,6 @@ struct NewtonTolerance<TypeTag, TTag::Co2InjectionFlashNiEcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionFlashNiEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionFlashNiEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_ni_vcfv.cpp

@@ -77,6 +77,6 @@ struct NewtonTolerance<TypeTag, TTag::Co2InjectionFlashNiVcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionFlashNiVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionFlashNiVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_vcfv.cpp

@@ -77,6 +77,6 @@ struct NewtonTolerance<TypeTag, TTag::Co2InjectionFlashVcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionFlashVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionFlashVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ecfv.cpp

@@ -54,6 +54,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionImmiscibleEcfvProb
 ////////////////////////
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionImmiscibleEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionImmiscibleEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ni_ecfv.cpp

@@ -58,6 +58,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::Co2InjectionImmiscibleNiEcfvProblem>
 ////////////////////////
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionImmiscibleNiEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionImmiscibleNiEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ni_vcfv.cpp

@@ -55,6 +55,6 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionImmiscibleNiVcfvProblem> { static
 ////////////////////////
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionImmiscibleNiVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionImmiscibleNiVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_vcfv.cpp

@@ -53,6 +53,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionImmiscibleVcfvProb
 ////////////////////////
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionImmiscibleVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionImmiscibleVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ecfv.cpp

@@ -46,6 +46,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionNcpEcfvProblem> {
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionNcpEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionNcpEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ni_ecfv.cpp

@@ -52,6 +52,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::Co2InjectionNcpNiEcfvProblem> { usin
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionNcpNiEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionNcpNiEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ni_vcfv.cpp

@@ -48,6 +48,6 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionNcpNiVcfvProblem> { static conste
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionNcpNiVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionNcpNiVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_vcfv.cpp

@@ -47,6 +47,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionNcpVcfvProblem> {
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionNcpVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionNcpVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ecfv.cpp

@@ -46,6 +46,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionPvsEcfvProblem> {
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionPvsEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionPvsEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ni_ecfv.cpp

@@ -53,6 +53,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::Co2InjectionPvsNiEcfvProblem> { usin
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionPvsNiEcfvProblem EcfvProblemTypeTag;
+    using EcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionPvsNiEcfvProblem;
     return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ni_vcfv.cpp

@@ -49,6 +49,6 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionPvsNiVcfvProblem> { static conste
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionPvsNiVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionPvsNiVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_vcfv.cpp

@@ -47,6 +47,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::Co2InjectionPvsVcfvProblem> {
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Co2InjectionPvsVcfvProblem VcfvProblemTypeTag;
+    using VcfvProblemTypeTag = Opm::Properties::TTag::Co2InjectionPvsVcfvProblem;
     return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/cuvette_pvs.cpp

@@ -42,6 +42,6 @@ struct CuvetteProblem { using InheritsFrom = std::tuple<CuvetteBaseProblem, PvsM
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::CuvetteProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::CuvetteProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_flash.cpp

@@ -42,6 +42,6 @@ struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem,
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::DiffusionProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::DiffusionProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_ncp.cpp

@@ -42,6 +42,6 @@ struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem,
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::DiffusionProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::DiffusionProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_pvs.cpp

@@ -42,6 +42,6 @@ struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem,
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::DiffusionProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::DiffusionProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/finger_immiscible_ecfv.cpp

@@ -45,6 +45,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::FingerProblemEcfv> { using typ
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::FingerProblemEcfv ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::FingerProblemEcfv;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/finger_immiscible_vcfv.cpp

@@ -45,6 +45,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::FingerProblemVcfv> { using typ
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::FingerProblemVcfv ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::FingerProblemVcfv;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/fracture_discretefracture.cpp

@@ -32,6 +32,6 @@
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::FractureProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::FractureProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/groundwater_immiscible.cpp

@@ -42,6 +42,6 @@ struct GroundWaterProblem { using InheritsFrom = std::tuple<GroundWaterBaseProbl
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::GroundWaterProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::GroundWaterProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/infiltration_pvs.cpp

@@ -42,6 +42,6 @@ struct InfiltrationProblem { using InheritsFrom = std::tuple<InfiltrationBasePro
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::InfiltrationProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::InfiltrationProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad.cpp

@@ -34,6 +34,6 @@
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemEcfvAd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemEcfvAd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_23.cpp

@@ -44,12 +44,12 @@ struct Grid <TypeTag, TTag::LensProblemEcfvAd>
     : public Dune::AnalyticalCoordFunction
       < ctype, dim, dimworld, IdentityCoordFct< ctype, dim, dimworld > >
   {
-    typedef IdentityCoordFct< ctype, dim, dimworld > This;
+    using This = IdentityCoordFct< ctype, dim, dimworld >;
-    typedef Dune::AnalyticalCoordFunction< ctype, dim, dimworld, This > Base;
+    using Base = Dune::AnalyticalCoordFunction< ctype, dim, dimworld, This >;
 
   public:
-    typedef typename Base :: DomainVector DomainVector;
+    using DomainVector = typename Base :: DomainVector;
-    typedef typename Base :: RangeVector  RangeVector;
+    using RangeVector = typename Base :: RangeVector ;
 
     template< typename... Args >
     IdentityCoordFct( Args&... )
@@ -71,14 +71,13 @@ struct Grid <TypeTag, TTag::LensProblemEcfvAd>
 
   };
 
-  typedef Dune::YaspGrid< 2 > MyYaspGrid;
+  using MyYaspGrid = Dune::YaspGrid< 2 >;
 
 public:
-  //typedef MyYaspGrid type;
+  using type = Dune::GeometryGrid< MyYaspGrid,
-  typedef Dune::GeometryGrid< MyYaspGrid,
+                                   IdentityCoordFct< typename MyYaspGrid::ctype,
-                              IdentityCoordFct< typename MyYaspGrid::ctype,
+                                                     MyYaspGrid::dimension,
-                                                MyYaspGrid::dimension,
+                                                     MyYaspGrid::dimensionworld+1> >;
-                                                MyYaspGrid::dimensionworld+1> >  type;
 };
 
 } // namespace Opm::Properties
@@ -87,6 +86,6 @@ public:
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemEcfvAd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemEcfvAd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_cu1.cpp

@@ -43,6 +43,6 @@ int mainCU1(int argc, char **argv);
 
 int mainCU1(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemEcfvAd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemEcfvAd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_cu2.cpp

@@ -43,6 +43,6 @@ int mainCU2(int argc, char **argv);
 
 int mainCU2(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemEcfvAd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemEcfvAd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_vcfv_ad.cpp

@@ -53,6 +53,6 @@ struct UseP1FiniteElementGradients<TypeTag, TTag::LensProblemVcfvAd> { static co
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemVcfvAd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemVcfvAd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_vcfv_fd.cpp

@@ -53,6 +53,6 @@ struct UseP1FiniteElementGradients<TypeTag, TTag::LensProblemVcfvFd> { static co
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::LensProblemVcfvFd ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::LensProblemVcfvFd;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_richards_ecfv.cpp

@@ -49,6 +49,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::RichardsLensEcfvProblem> { using typ
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::RichardsLensEcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::RichardsLensEcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_richards_vcfv.cpp

@@ -45,6 +45,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::RichardsLensVcfvProblem> { usi
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::RichardsLensVcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::RichardsLensVcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_immiscible.cpp

@@ -43,6 +43,6 @@ struct ObstacleProblem { using InheritsFrom = std::tuple<ObstacleBaseProblem, Im
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ObstacleProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_ncp.cpp

@@ -43,6 +43,6 @@ struct ObstacleProblem { using InheritsFrom = std::tuple<ObstacleBaseProblem, Nc
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ObstacleProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_pvs.cpp

@@ -48,6 +48,6 @@ struct PvsVerbosity<TypeTag, TTag::ObstacleProblem> { static constexpr int value
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ObstacleProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ObstacleProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/outflow_pvs.cpp

@@ -46,6 +46,6 @@ struct PvsVerbosity<TypeTag, TTag::OutflowProblem> { static constexpr int value
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::OutflowProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::OutflowProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_darcy_ad.cpp

@@ -49,6 +49,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::PowerInjectionDarcyAdProblem> { usin
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::PowerInjectionDarcyAdProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::PowerInjectionDarcyAdProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_darcy_fd.cpp

@@ -49,6 +49,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::PowerInjectionDarcyFdProblem> { usin
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::PowerInjectionDarcyFdProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::PowerInjectionDarcyFdProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_forchheimer_ad.cpp

@@ -49,6 +49,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::PowerInjectionForchheimerAdProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::PowerInjectionForchheimerAdProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::PowerInjectionForchheimerAdProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_forchheimer_fd.cpp

@@ -49,6 +49,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::PowerInjectionForchheimerFdProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::PowerInjectionForchheimerFdProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::PowerInjectionForchheimerFdProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/problems/co2injectionflash.hh

@@ -41,7 +41,7 @@ namespace Opm {
 template <class Scalar, class FluidSystem>
 class Co2InjectionFlash : public Opm::NcpFlash<Scalar, FluidSystem>
 {
-    typedef Opm::NcpFlash<Scalar, FluidSystem> ParentType;
+    using ParentType = Opm::NcpFlash<Scalar, FluidSystem>;
 
     enum { numPhases = FluidSystem::numPhases };
 

examples/problems/co2injectionproblem.hh

@@ -109,12 +109,12 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::Co2InjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::Co2Injection::CO2Tables CO2Tables;
+    using CO2Tables = Opm::Co2Injection::CO2Tables;
 
 public:
-    typedef Opm::BrineCO2FluidSystem<Scalar, CO2Tables> type;
+    using type = Opm::BrineCO2FluidSystem<Scalar, CO2Tables>;
-    //typedef Opm::H2ON2FluidSystem<Scalar, /*useComplexRelations=*/false> type;
+    //using type = Opm::H2ON2FluidSystem<Scalar, /*useComplexRelations=*/false>;
 };
 
 // Set the material Law
@@ -122,22 +122,22 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::Co2InjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { liquidPhaseIdx = FluidSystem::liquidPhaseIdx };
     enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+                                               /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedBrooksCorey<Traits> EffMaterialLaw;
+    using EffMaterialLaw = Opm::RegularizedBrooksCorey<Traits>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::EffToAbsLaw<EffMaterialLaw> type;
+    using type = Opm::EffToAbsLaw<EffMaterialLaw>;
 };
 
 // Set the thermal conduction law
@@ -145,12 +145,12 @@ template<class TypeTag>
 struct ThermalConductionLaw<TypeTag, TTag::Co2InjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
+    using type = Opm::SomertonThermalConductionLaw<FluidSystem, Scalar>;
 };
 
 // set the energy storage law for the solid phase
@@ -263,18 +263,18 @@ namespace Opm {
 template <class TypeTag>
 class Co2InjectionProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { dim = GridView::dimension };
     enum { dimWorld = GridView::dimensionworld };
 
     // copy some indices for convenience
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum { numPhases = FluidSystem::numPhases };
     enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };
     enum { liquidPhaseIdx = FluidSystem::liquidPhaseIdx };
@@ -283,21 +283,21 @@ class Co2InjectionProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     enum { conti0EqIdx = Indices::conti0EqIdx };
     enum { contiCO2EqIdx = conti0EqIdx + CO2Idx };
 
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLaw> ThermalConductionLaw;
+    using ThermalConductionLaw = GetPropType<TypeTag, Properties::ThermalConductionLaw>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
-    typedef typename ThermalConductionLaw::Params ThermalConductionLawParams;
+    using ThermalConductionLawParams = typename ThermalConductionLaw::Params;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -552,7 +552,7 @@ public:
             RateVector massRate(0.0);
             massRate[contiCO2EqIdx] = -1e-3; // [kg/(m^3 s)]
 
-            typedef Opm::ImmiscibleFluidState<Scalar, FluidSystem> FluidState;
+            using FluidState = Opm::ImmiscibleFluidState<Scalar, FluidSystem>;
             FluidState fs;
             fs.setSaturation(gasPhaseIdx, 1.0);
             const auto& pg =
@@ -653,7 +653,7 @@ private:
                            1.0 - fs.moleFraction(liquidPhaseIdx, CO2Idx));
 
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> CFRP;
+        using CFRP = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
         CFRP::solve(fs, paramCache,
                     /*refPhaseIdx=*/liquidPhaseIdx,
                     /*setViscosity=*/true,

examples/problems/cuvetteproblem.hh

@@ -94,17 +94,17 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::CuvetteBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
-    typedef Opm::ThreePhaseMaterialTraits<
+    using Traits = Opm::ThreePhaseMaterialTraits<
         Scalar,
         /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
         /*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
-        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
 public:
-    typedef Opm::ThreePhaseParkerVanGenuchten<Traits> type;
+    using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
 };
 
 // set the energy storage law for the solid phase
@@ -117,12 +117,12 @@ template<class TypeTag>
 struct ThermalConductionLaw<TypeTag, TTag::CuvetteBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
+    using type = Opm::SomertonThermalConductionLaw<FluidSystem, Scalar>;
 };
 
 // The default for the end time of the simulation
@@ -178,24 +178,24 @@ namespace Opm {
 template <class TypeTag>
 class CuvetteProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLawParams> ThermalConductionLawParams;
+    using ThermalConductionLawParams = GetPropType<TypeTag, Properties::ThermalConductionLawParams>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     // copy some indices for convenience
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum { numPhases = FluidSystem::numPhases };
     enum { numComponents = FluidSystem::numComponents };
     enum { waterPhaseIdx = FluidSystem::waterPhaseIdx };
@@ -209,9 +209,9 @@ class CuvetteProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     // Grid and world dimension
     enum { dimWorld = GridView::dimensionworld };
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -546,7 +546,7 @@ private:
                 fs.setPressure(phaseIdx, pw + (pc[phaseIdx] - pc[waterPhaseIdx]));
 
             // compute the phase compositions
-            typedef Opm::MiscibleMultiPhaseComposition<Scalar, FluidSystem> MMPC;
+            using MMPC = Opm::MiscibleMultiPhaseComposition<Scalar, FluidSystem>;
             typename FluidSystem::template ParameterCache<Scalar> paramCache;
             MMPC::solve(fs, paramCache, /*setViscosity=*/true, /*setEnthalpy=*/true);
         }
@@ -563,7 +563,7 @@ private:
                 fs.setPressure(phaseIdx, pw + (pc[phaseIdx] - pc[waterPhaseIdx]));
 
             // compute the phase compositions
-            typedef Opm::MiscibleMultiPhaseComposition<Scalar, FluidSystem> MMPC;
+            using MMPC = Opm::MiscibleMultiPhaseComposition<Scalar, FluidSystem>;
             typename FluidSystem::template ParameterCache<Scalar> paramCache;
             MMPC::solve(fs, paramCache, /*setViscosity=*/true, /*setEnthalpy=*/true);
 

examples/problems/diffusionproblem.hh

@@ -77,10 +77,10 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::DiffusionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::H2ON2FluidSystem<Scalar> type;
+    using type = Opm::H2ON2FluidSystem<Scalar>;
 };
 
 // Set the material Law
@@ -88,19 +88,19 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::DiffusionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     static_assert(FluidSystem::numPhases == 2,
                   "A fluid system with two phases is required "
                   "for this problem!");
 
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+                                               /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
 public:
-    typedef Opm::LinearMaterial<Traits> type;
+    using type = Opm::LinearMaterial<Traits>;
 };
 
 // Enable molecular diffusion for this problem
@@ -170,14 +170,14 @@ namespace Opm {
 template <class TypeTag>
 class DiffusionProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum {
         // number of phases
@@ -196,17 +196,17 @@ class DiffusionProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         dimWorld = GridView::dimensionworld
     };
 
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
 
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -386,7 +386,7 @@ private:
         leftInitialFluidState_.setMoleFraction(gasPhaseIdx, H2OIdx, xH2O);
         leftInitialFluidState_.setMoleFraction(gasPhaseIdx, N2Idx, 1 - xH2O);
 
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> CFRP;
+        using CFRP = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
         CFRP::solve(leftInitialFluidState_, paramCache, gasPhaseIdx,
                     /*setViscosity=*/false, /*setEnthalpy=*/false);

examples/problems/fingerproblem.hh

@@ -92,10 +92,10 @@ template<class TypeTag>
 struct WettingPhase<TypeTag, TTag::FingerBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the non-wetting phase
@@ -103,25 +103,25 @@ template<class TypeTag>
 struct NonwettingPhase<TypeTag, TTag::FingerBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::GasPhase<Scalar, Opm::Air<Scalar> > type;
+    using type = Opm::GasPhase<Scalar, Opm::Air<Scalar> >;
 };
 
 // Set the material Law
 template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::FingerBaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx> Traits;
+                                               /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>;
 
     // use the parker-lenhard hysteresis law
-    typedef Opm::ParkerLenhard<Traits> ParkerLenhard;
+    using ParkerLenhard = Opm::ParkerLenhard<Traits>;
-    typedef ParkerLenhard type;
+    using type = ParkerLenhard;
 };
 
 // Write the solutions of individual newton iterations?
@@ -213,18 +213,18 @@ template <class TypeTag>
 class FingerProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
     //!\cond SKIP_THIS
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::WettingPhase> WettingPhase;
+    using WettingPhase = GetPropType<TypeTag, Properties::WettingPhase>;
-    typedef GetPropType<TypeTag, Properties::NonwettingPhase> NonwettingPhase;
+    using NonwettingPhase = GetPropType<TypeTag, Properties::NonwettingPhase>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Constraints> Constraints;
+    using Constraints = GetPropType<TypeTag, Properties::Constraints>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum {
         // number of phases
@@ -242,28 +242,28 @@ class FingerProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         dimWorld = GridView::dimensionworld
     };
 
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Stencil>  Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil> ;
     enum { codim = Stencil::Entity::codimension };
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
 
-    typedef typename GetProp<TypeTag, Properties::MaterialLaw>::ParkerLenhard ParkerLenhard;
+    using ParkerLenhard = typename GetProp<TypeTag, Properties::MaterialLaw>::ParkerLenhard;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
-    typedef typename GridView :: Grid Grid;
+    using Grid = typename GridView :: Grid;
 
-    typedef Dune::PersistentContainer< Grid, std::shared_ptr< MaterialLawParams > >   MaterialLawParamsContainer;
+    using MaterialLawParamsContainer = Dune::PersistentContainer< Grid, std::shared_ptr< MaterialLawParams > >  ;
     //!\endcond
 
 public:
-    typedef CopyRestrictProlong< Grid, MaterialLawParamsContainer > RestrictProlongOperator;
+    using RestrictProlongOperator = CopyRestrictProlong< Grid, MaterialLawParamsContainer >;
 
     /*!
      * \copydoc Doxygen::defaultProblemConstructor

examples/problems/fractureproblem.hh

@@ -91,10 +91,10 @@ template<class TypeTag>
 struct WettingPhase<TypeTag, TTag::FractureProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the non-wetting phase
@@ -102,10 +102,10 @@ template<class TypeTag>
 struct NonwettingPhase<TypeTag, TTag::FractureProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::DNAPL<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::DNAPL<Scalar> >;
 };
 
 // Set the material Law
@@ -113,23 +113,22 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::FractureProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { wettingPhaseIdx = FluidSystem::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx };
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>
+                                               /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>;
-    Traits;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedBrooksCorey<Traits> EffectiveLaw;
+    using EffectiveLaw = Opm::RegularizedBrooksCorey<Traits>;
-    // typedef RegularizedVanGenuchten<Traits> EffectiveLaw;
+    // using EffectiveLaw = RegularizedVanGenuchten<Traits>;
-    // typedef LinearMaterial<Traits> EffectiveLaw;
+    // using EffectiveLaw = LinearMaterial<Traits>;
 public:
-    typedef Opm::EffToAbsLaw<EffectiveLaw> type;
+    using type = Opm::EffToAbsLaw<EffectiveLaw>;
 };
 
 // Enable the energy equation
@@ -141,12 +140,12 @@ template<class TypeTag>
 struct ThermalConductionLaw<TypeTag, TTag::FractureProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
+    using type = Opm::SomertonThermalConductionLaw<FluidSystem, Scalar>;
 };
 
 // set the energy storage law for the solid phase
@@ -200,23 +199,23 @@ namespace Opm {
 template <class TypeTag>
 class FractureProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::WettingPhase> WettingPhase;
+    using WettingPhase = GetPropType<TypeTag, Properties::WettingPhase>;
-    typedef GetPropType<TypeTag, Properties::NonwettingPhase> NonwettingPhase;
+    using NonwettingPhase = GetPropType<TypeTag, Properties::NonwettingPhase>;
-    typedef GetPropType<TypeTag, Properties::Constraints> Constraints;
+    using Constraints = GetPropType<TypeTag, Properties::Constraints>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLawParams> ThermalConductionLawParams;
+    using ThermalConductionLawParams = GetPropType<TypeTag, Properties::ThermalConductionLawParams>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum {
         // phase indices
@@ -231,10 +230,10 @@ class FractureProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         dimWorld = GridView::dimensionworld
     };
 
-    typedef Opm::ImmiscibleFluidState<Scalar, FluidSystem> FluidState;
+    using FluidState = Opm::ImmiscibleFluidState<Scalar, FluidSystem>;
 
-    typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
     template <int dim>
     struct FaceLayout
@@ -242,9 +241,9 @@ class FractureProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         bool contains(Dune::GeometryType gt)
         { return gt.dim() == dim - 1; }
     };
-    typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, FaceLayout> FaceMapper;
+    using FaceMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView, FaceLayout>;
 
-    typedef Opm::FractureMapper<TypeTag> FractureMapper;
+    using FractureMapper = Opm::FractureMapper<TypeTag>;
 
 public:
     /*!

examples/problems/groundwaterproblem.hh

@@ -78,10 +78,10 @@ template<class TypeTag>
 struct Fluid<TypeTag, TTag::GroundWaterBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the grid type
@@ -193,14 +193,14 @@ namespace Opm {
 template <class TypeTag>
 class GroundWaterProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     // copy some indices for convenience
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum {
         numPhases = FluidSystem::numPhases,
 
@@ -212,17 +212,17 @@ class GroundWaterProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         pressure0Idx = Indices::pressure0Idx
     };
 
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

examples/problems/infiltrationproblem.hh

@@ -88,17 +88,17 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::InfiltrationBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
-    typedef Opm::ThreePhaseMaterialTraits<
+    using Traits= Opm::ThreePhaseMaterialTraits<
         Scalar,
         /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
         /*nonWettingPhaseIdx=*/FluidSystem::naplPhaseIdx,
-        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+        /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
 public:
-    typedef Opm::ThreePhaseParkerVanGenuchten<Traits> type;
+    using type = Opm::ThreePhaseParkerVanGenuchten<Traits>;
 };
 
 // The default for the end time of the simulation
@@ -150,22 +150,22 @@ namespace Opm {
 template <class TypeTag>
 class InfiltrationProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     // copy some indices for convenience
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum {
         // equation indices
         conti0EqIdx = Indices::conti0EqIdx,
@@ -188,9 +188,9 @@ class InfiltrationProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         dimWorld = GridView::dimensionworld
     };
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -464,7 +464,7 @@ private:
                            1 - fs.moleFraction(gasPhaseIdx, H2OIdx));
         fs.setMoleFraction(gasPhaseIdx, NAPLIdx, 0);
 
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> CFRP;
+        using CFRP = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
         CFRP::solve(fs, paramCache, gasPhaseIdx,
                     /*setViscosity=*/true,

examples/problems/lensproblem.hh

@@ -90,10 +90,10 @@ template<class TypeTag>
 struct WettingPhase<TypeTag, TTag::LensBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the non-wetting phase
@@ -101,10 +101,10 @@ template<class TypeTag>
 struct NonwettingPhase<TypeTag, TTag::LensBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::DNAPL<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::DNAPL<Scalar> >;
 };
 
 // Set the material Law
@@ -112,22 +112,22 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::LensBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { wettingPhaseIdx = FluidSystem::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx };
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx> Traits;
+                                               /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedVanGenuchten<Traits> EffectiveLaw;
+    using EffectiveLaw = Opm::RegularizedVanGenuchten<Traits>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::EffToAbsLaw<EffectiveLaw> type;
+    using type = Opm::EffToAbsLaw<EffectiveLaw>;
 };
 
 // Write the solutions of individual newton iterations?
@@ -264,17 +264,17 @@ namespace Opm {
 template <class TypeTag>
 class LensProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::WettingPhase> WettingPhase;
+    using WettingPhase = GetPropType<TypeTag, Properties::WettingPhase>;
-    typedef GetPropType<TypeTag, Properties::NonwettingPhase> NonwettingPhase;
+    using NonwettingPhase = GetPropType<TypeTag, Properties::NonwettingPhase>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum {
         // number of phases
@@ -292,16 +292,16 @@ class LensProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         dimWorld = GridView::dimensionworld
     };
 
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -397,13 +397,13 @@ public:
             thermal = "non-isothermal";
 
         std::string deriv = "finite difference";
-        typedef GetPropType<TypeTag, Properties::LocalLinearizerSplice> LLS;
+        using LLS = GetPropType<TypeTag, Properties::LocalLinearizerSplice>;
         bool useAutoDiff = std::is_same<LLS, Properties::TTag::AutoDiffLocalLinearizer>::value;
         if (useAutoDiff)
             deriv = "automatic differentiation";
 
         std::string disc = "vertex centered finite volume";
-        typedef GetPropType<TypeTag, Properties::Discretization> D;
+        using D = GetPropType<TypeTag, Properties::Discretization>;
         bool useEcfv = std::is_same<D, Opm::EcfvDiscretization<TypeTag>>::value;
         if (useEcfv)
             disc = "element centered finite volume";
@@ -478,7 +478,7 @@ public:
      */
     std::string name() const
     {
-        typedef GetPropType<TypeTag, Properties::LocalLinearizerSplice> LLS;
+        using LLS = GetPropType<TypeTag, Properties::LocalLinearizerSplice>;
 
         bool useAutoDiff = std::is_same<LLS, Properties::TTag::AutoDiffLocalLinearizer>::value;
 

examples/problems/obstacleproblem.hh

@@ -82,17 +82,16 @@ struct MaterialLaw<TypeTag, TTag::ObstacleBaseProblem>
 {
 private:
     // define the material law
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using MaterialTraits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
+                                                       /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>
+                                                       /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>;
-    MaterialTraits;
 
-    typedef Opm::LinearMaterial<MaterialTraits> EffMaterialLaw;
+    using EffMaterialLaw = Opm::LinearMaterial<MaterialTraits>;
 
 public:
-    typedef Opm::EffToAbsLaw<EffMaterialLaw> type;
+    using type = Opm::EffToAbsLaw<EffMaterialLaw>;
 };
 
 // Set the thermal conduction law
@@ -100,12 +99,12 @@ template<class TypeTag>
 struct ThermalConductionLaw<TypeTag, TTag::ObstacleBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
+    using type = Opm::SomertonThermalConductionLaw<FluidSystem, Scalar>;
 };
 
 // set the energy storage law for the solid phase
@@ -169,19 +168,19 @@ namespace Opm {
 template <class TypeTag>
 class ObstacleProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLawParams> ThermalConductionLawParams;
+    using ThermalConductionLawParams = GetPropType<TypeTag, Properties::ThermalConductionLawParams>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
 
     enum {
         // Grid and world dimension
@@ -194,11 +193,11 @@ class ObstacleProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         N2Idx = FluidSystem::N2Idx
     };
 
-    typedef Dune::FieldVector<typename GridView::ctype, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<typename GridView::ctype, dimWorld>;
-    typedef Dune::FieldVector<Scalar, numPhases> PhaseVector;
+    using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
 public:
     /*!
@@ -548,7 +547,7 @@ private:
 
         // make the fluid state consistent with local thermodynamic
         // equilibrium
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
+        using ComputeFromReferencePhase = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
 
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
         ComputeFromReferencePhase::solve(fs, paramCache, refPhaseIdx,

examples/problems/outflowproblem.hh

@@ -66,11 +66,11 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::OutflowBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
     // Two-component single phase fluid system
-    typedef Opm::H2ON2LiquidPhaseFluidSystem<Scalar> type;
+    using type = Opm::H2ON2LiquidPhaseFluidSystem<Scalar>;
 };
 
 // Disable gravity
@@ -124,17 +124,17 @@ namespace Opm {
 template <class TypeTag>
 class OutflowProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
     // copy some indices for convenience
     enum {
@@ -149,10 +149,10 @@ class OutflowProblem : public GetPropType<TypeTag, Properties::BaseProblem>
         N2Idx = FluidSystem::N2Idx
     };
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

examples/problems/powerinjectionproblem.hh

@@ -80,10 +80,10 @@ template<class TypeTag>
 struct WettingPhase<TypeTag, TTag::PowerInjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the non-wetting phase
@@ -91,10 +91,10 @@ template<class TypeTag>
 struct NonwettingPhase<TypeTag, TTag::PowerInjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::GasPhase<Scalar, Opm::Air<Scalar> > type;
+    using type = Opm::GasPhase<Scalar, Opm::Air<Scalar> >;
 };
 
 // Set the material Law
@@ -102,23 +102,22 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::PowerInjectionBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { wettingPhaseIdx = FluidSystem::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx };
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>
+                                               /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>;
-        Traits;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedVanGenuchten<Traits> EffectiveLaw;
+    using EffectiveLaw = Opm::RegularizedVanGenuchten<Traits>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::EffToAbsLaw<EffectiveLaw> type;
+    using type = Opm::EffToAbsLaw<EffectiveLaw>;
 };
 
 // Write out the filter velocities for this problem
@@ -190,19 +189,19 @@ namespace Opm {
 template <class TypeTag>
 class PowerInjectionProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::WettingPhase> WettingPhase;
+    using WettingPhase = GetPropType<TypeTag, Properties::WettingPhase>;
-    typedef GetPropType<TypeTag, Properties::NonwettingPhase> NonwettingPhase;
+    using NonwettingPhase = GetPropType<TypeTag, Properties::NonwettingPhase>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
     enum {
         // number of phases
@@ -220,13 +219,13 @@ class PowerInjectionProblem : public GetPropType<TypeTag, Properties::BaseProble
         dimWorld = GridView::dimensionworld
     };
 
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

examples/problems/reservoirproblem.hh

@@ -88,17 +88,17 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::ReservoirBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
-    typedef Opm::
+    using Traits = Opm::
         ThreePhaseMaterialTraits<Scalar,
                                  /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
                                  /*nonWettingPhaseIdx=*/FluidSystem::oilPhaseIdx,
-                                 /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+                                 /*gasPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
 public:
-    typedef Opm::LinearMaterial<Traits> type;
+    using type = Opm::LinearMaterial<Traits>;
 };
 
 // Write the Newton convergence behavior to disk?
@@ -166,10 +166,10 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::ReservoirBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::BlackOilFluidSystem<Scalar> type;
+    using type = Opm::BlackOilFluidSystem<Scalar>;
 };
 
 // The default DGF file to load
@@ -207,12 +207,12 @@ namespace Opm {
 template <class TypeTag>
 class ReservoirProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     // Grid and world dimension
     enum { dim = GridView::dimension };
@@ -228,25 +228,25 @@ class ReservoirProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     enum { oilCompIdx = FluidSystem::oilCompIdx };
     enum { waterCompIdx = FluidSystem::waterCompIdx };
 
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::Constraints> Constraints;
+    using Constraints = GetPropType<TypeTag, Properties::Constraints>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef Dune::FieldVector<Scalar, numPhases> PhaseVector;
+    using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
 
-    typedef Opm::CompositionalFluidState<Scalar,
+    using InitialFluidState = Opm::CompositionalFluidState<Scalar,
-                                         FluidSystem,
+                                                           FluidSystem,
-                                         /*enableEnthalpy=*/true> InitialFluidState;
+                                                           /*enableEnthalpy=*/true>;
 
 public:
     /*!
@@ -362,13 +362,13 @@ public:
         oilPvt->initEnd();
         waterPvt->initEnd();
 
-        typedef std::shared_ptr<Opm::GasPvtMultiplexer<Scalar> > GasPvtSharedPtr;
+        using GasPvtSharedPtr = std::shared_ptr<Opm::GasPvtMultiplexer<Scalar> >;
         FluidSystem::setGasPvt(GasPvtSharedPtr(gasPvt));
 
-        typedef std::shared_ptr<Opm::OilPvtMultiplexer<Scalar> > OilPvtSharedPtr;
+        using OilPvtSharedPtr = std::shared_ptr<Opm::OilPvtMultiplexer<Scalar> >;
         FluidSystem::setOilPvt(OilPvtSharedPtr(oilPvt));
 
-        typedef std::shared_ptr<Opm::WaterPvtMultiplexer<Scalar> > WaterPvtSharedPtr;
+        using WaterPvtSharedPtr = std::shared_ptr<Opm::WaterPvtMultiplexer<Scalar> >;
         FluidSystem::setWaterPvt(WaterPvtSharedPtr(waterPvt));
 
         FluidSystem::initEnd();
@@ -684,7 +684,7 @@ private:
         fs.setMoleFraction(oilPhaseIdx, gasCompIdx, xoG);
         fs.setMoleFraction(oilPhaseIdx, oilCompIdx, xoO);
 
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> CFRP;
+        using CFRP = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
         CFRP::solve(fs,
                     paramCache,

examples/problems/richardslensproblem.hh

@@ -71,10 +71,10 @@ template<class TypeTag>
 struct WettingFluid<TypeTag, TTag::RichardsLensProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> > type;
+    using type = Opm::LiquidPhase<Scalar, Opm::SimpleH2O<Scalar> >;
 };
 
 // Set the material Law
@@ -82,23 +82,22 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::RichardsLensProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { wettingPhaseIdx = FluidSystem::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx };
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::wettingPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>
+                                               /*nonWettingPhaseIdx=*/FluidSystem::nonWettingPhaseIdx>;
-        Traits;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedVanGenuchten<Traits> EffectiveLaw;
+    using EffectiveLaw = Opm::RegularizedVanGenuchten<Traits>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::EffToAbsLaw<EffectiveLaw> type;
+    using type = Opm::EffToAbsLaw<EffectiveLaw>;
 };
 
 // Enable gravitational acceleration
@@ -164,20 +163,20 @@ namespace Opm {
 template <class TypeTag>
 class RichardsLensProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Stencil> Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum {
         // copy some indices for convenience
         pressureWIdx = Indices::pressureWIdx,
@@ -191,14 +190,14 @@ class RichardsLensProblem : public GetPropType<TypeTag, Properties::BaseProblem>
     };
 
     // get the material law from the property system
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
     //! The parameters of the material law to be used
-    typedef typename MaterialLaw::Params MaterialLawParams;
+    using MaterialLawParams = typename MaterialLaw::Params;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldVector<Scalar, numPhases> PhaseVector;
+    using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

examples/problems/waterairproblem.hh

@@ -77,20 +77,20 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::WaterAirBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef Opm::TwoPhaseMaterialTraits<Scalar,
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar,
-                                        /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
+                                               /*wettingPhaseIdx=*/FluidSystem::liquidPhaseIdx,
-                                        /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx> Traits;
+                                               /*nonWettingPhaseIdx=*/FluidSystem::gasPhaseIdx>;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedBrooksCorey<Traits> EffMaterialLaw;
+    using EffMaterialLaw = Opm::RegularizedBrooksCorey<Traits>;
 
 public:
     // define the material law parameterized by absolute saturations
     // which uses the two-phase API
-    typedef Opm::EffToAbsLaw<EffMaterialLaw> type;
+    using type = Opm::EffToAbsLaw<EffMaterialLaw>;
 };
 
 // Set the thermal conduction law
@@ -98,12 +98,12 @@ template<class TypeTag>
 struct ThermalConductionLaw<TypeTag, TTag::WaterAirBaseProblem>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     // define the material law parameterized by absolute saturations
-    typedef Opm::SomertonThermalConductionLaw<FluidSystem, Scalar> type;
+    using type = Opm::SomertonThermalConductionLaw<FluidSystem, Scalar>;
 };
 
 // set the energy storage law for the solid phase
@@ -204,14 +204,14 @@ namespace Opm {
 template <class TypeTag >
 class WaterAirProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     // copy some indices for convenience
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
     enum {
         numPhases = FluidSystem::numPhases,
 
@@ -237,22 +237,22 @@ class WaterAirProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 
     static const bool enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>();
 
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Constraints> Constraints;
+    using Constraints = GetPropType<TypeTag, Properties::Constraints>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLawParams> ThermalConductionLawParams;
+    using ThermalConductionLawParams = GetPropType<TypeTag, Properties::ThermalConductionLawParams>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!
@@ -561,7 +561,7 @@ private:
         fs.setPressure(gasPhaseIdx, fs.pressure(liquidPhaseIdx) + (pc[gasPhaseIdx] - pc[liquidPhaseIdx]));
 
         typename FluidSystem::template ParameterCache<Scalar> paramCache;
-        typedef Opm::ComputeFromReferencePhase<Scalar, FluidSystem> CFRP;
+        using CFRP = Opm::ComputeFromReferencePhase<Scalar, FluidSystem>;
         CFRP::solve(fs, paramCache, liquidPhaseIdx, /*setViscosity=*/true,  /*setEnthalpy=*/true);
     }
 

examples/reservoir_blackoil_ecfv.cpp

@@ -52,6 +52,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::ReservoirBlackOilEcfvProblem> { usin
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ReservoirBlackOilEcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ReservoirBlackOilEcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_blackoil_vcfv.cpp

@@ -47,6 +47,6 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::ReservoirBlackOilVcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ReservoirBlackOilVcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ReservoirBlackOilVcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_ncp_ecfv.cpp

@@ -51,6 +51,6 @@ struct LocalLinearizerSplice<TypeTag, TTag::ReservoirNcpEcfvProblem> { using typ
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ReservoirNcpEcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ReservoirNcpEcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_ncp_vcfv.cpp

@@ -63,6 +63,6 @@ struct BaseEpsilon<TypeTag, TTag::ReservoirNcpVcfvProblem>
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::ReservoirNcpVcfvProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::ReservoirNcpVcfvProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/tutorial1.cpp

@@ -32,6 +32,6 @@
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::Tutorial1Problem TypeTag; /*@\label{tutorial1:set-type-tag}@*/
+    using TypeTag = Opm::Properties::TTag::Tutorial1Problem; /*@\label{tutorial1:set-type-tag}@*/
     return Opm::start<TypeTag>(argc, argv); /*@\label{tutorial1:call-start}@*/
 }

examples/tutorial1problem.hh

@@ -104,20 +104,20 @@ struct MaterialLaw<TypeTag, TTag::Tutorial1Problem>
 private:
     // create a class holding the necessary information for a
     // two-phase capillary pressure law
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
     enum { wettingPhaseIdx = FluidSystem::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx };
-    typedef Opm::TwoPhaseMaterialTraits<Scalar, wettingPhaseIdx, nonWettingPhaseIdx> Traits;
+    using Traits = Opm::TwoPhaseMaterialTraits<Scalar, wettingPhaseIdx, nonWettingPhaseIdx>;
 
     // define the material law which is parameterized by effective
     // saturations
-    typedef Opm::RegularizedBrooksCorey<Traits> RawMaterialLaw; /*@\label{tutorial1:rawlaw}@*/
+    using RawMaterialLaw = Opm::RegularizedBrooksCorey<Traits>; /*@\label{tutorial1:rawlaw}@*/
 
 public:
     // Convert absolute saturations into effective ones before passing
     // it to the base capillary pressure law
-    typedef Opm::EffToAbsLaw<RawMaterialLaw> type; /*@\label{tutorial1:eff2abs}@*/
+    using type = Opm::EffToAbsLaw<RawMaterialLaw>; /*@\label{tutorial1:eff2abs}@*/
 };
 
 // Disable gravity
@@ -176,25 +176,25 @@ template <class TypeTag>
 class Tutorial1Problem
     : public GetPropType<TypeTag, Properties::BaseProblem> /*@\label{tutorial1:def-problem}@*/
 {
-    typedef GetPropType<TypeTag, Properties::BaseProblem> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::BaseProblem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     // Grid dimension
     enum { dimWorld = GridView::dimensionworld };
 
     // The type of the intrinsic permeability tensor
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
     // eWoms specific types are specified via the property system
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams; /*@\label{tutorial1:matLawObjectType}@*/
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>; /*@\label{tutorial1:matLawObjectType}@*/
 
     // phase indices
     enum { numPhases = FluidSystem::numPhases };

examples/waterair_pvs_ni.cpp

@@ -45,6 +45,6 @@ struct EnableEnergy<TypeTag, TTag::WaterAirProblem> { static constexpr bool valu
 
 int main(int argc, char **argv)
 {
-    typedef Opm::Properties::TTag::WaterAirProblem ProblemTypeTag;
+    using ProblemTypeTag = Opm::Properties::TTag::WaterAirProblem;
     return Opm::start<ProblemTypeTag>(argc, argv);
 }

opm/models/blackoil/blackoilboundaryratevector.hh

@@ -44,14 +44,14 @@ namespace Opm {
 template <class TypeTag>
 class BlackOilBoundaryRateVector : public GetPropType<TypeTag, Properties::RateVector>
 {
-    typedef GetPropType<TypeTag, Properties::RateVector> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::LocalResidual> LocalResidual;
+    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
@@ -65,7 +65,7 @@ class BlackOilBoundaryRateVector : public GetPropType<TypeTag, Properties::RateV
 
     static constexpr bool blackoilConserveSurfaceVolume = getPropValue<TypeTag, Properties::BlackoilConserveSurfaceVolume>();
 
-    typedef Opm::BlackOilEnergyModule<TypeTag, enableEnergy> EnergyModule;
+    using EnergyModule = Opm::BlackOilEnergyModule<TypeTag, enableEnergy>;
 
 public:
     /*!
@@ -120,8 +120,8 @@ public:
                                                                      extQuants,
                                                                      insideIntQuants.fluidState());
             else if (pBoundary > pInside) {
-                typedef typename std::conditional<std::is_same<typename FluidState::Scalar, Evaluation>::value,
+                using RhsEval = typename std::conditional<std::is_same<typename FluidState::Scalar, Evaluation>::value,
-                                                  Evaluation, Scalar>::type RhsEval;
+                                                          Evaluation, Scalar>::type;
                 // influx
                 LocalResidual::template evalPhaseFluxes_<RhsEval>(tmp,
                                                                   phaseIdx,

opm/models/blackoil/blackoilbrinemodules.hh

@@ -58,23 +58,23 @@ namespace Opm {
 template <class TypeTag, bool enableBrineV = getPropValue<TypeTag, Properties::EnableBrine>()>
 class BlackOilBrineModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
-    typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
+    using TabulatedFunction = typename Opm::Tabulated1DFunction<Scalar>;
-    typedef typename Opm::IntervalTabulated2DFunction<Scalar> TabulatedTwoDFunction;
+    using TabulatedTwoDFunction = typename Opm::IntervalTabulated2DFunction<Scalar>;
 
     static constexpr unsigned saltConcentrationIdx = Indices::saltConcentrationIdx;
     static constexpr unsigned contiBrineEqIdx = Indices::contiBrineEqIdx;
@@ -340,17 +340,17 @@ BlackOilBrineModule<TypeTag, enableBrineV>::referencePressure_;
 template <class TypeTag, bool enableBrineV = getPropValue<TypeTag, Properties::EnableBrine>()>
 class BlackOilBrineIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef BlackOilBrineModule<TypeTag> BrineModule;
+    using BrineModule = BlackOilBrineModule<TypeTag>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     static constexpr int saltConcentrationIdx = Indices::saltConcentrationIdx;
@@ -396,9 +396,9 @@ protected:
 template <class TypeTag>
 class BlackOilBrineIntensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
     void updateSaltConcentration_(const ElementContext& elemCtx OPM_UNUSED,

opm/models/blackoil/blackoildarcyfluxmodule.hh

@@ -47,9 +47,9 @@ class BlackOilDarcyExtensiveQuantities;
 template <class TypeTag>
 struct BlackOilDarcyFluxModule
 {
-    typedef DarcyIntensiveQuantities<TypeTag> FluxIntensiveQuantities;
+    using FluxIntensiveQuantities = DarcyIntensiveQuantities<TypeTag>;
-    typedef BlackOilDarcyExtensiveQuantities<TypeTag> FluxExtensiveQuantities;
+    using FluxExtensiveQuantities = BlackOilDarcyExtensiveQuantities<TypeTag>;
-    typedef DarcyBaseProblem<TypeTag> FluxBaseProblem;
+    using FluxBaseProblem = DarcyBaseProblem<TypeTag>;
 
     /*!
      * \brief Register all run-time parameters for the flux module.
@@ -70,9 +70,9 @@ struct BlackOilDarcyFluxModule
 template <class TypeTag>
 class BlackOilDarcyExtensiveQuantities : public DarcyExtensiveQuantities<TypeTag>
 {
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
 public:
     /*!

opm/models/blackoil/blackoilenergymodules.hh

@@ -51,18 +51,18 @@ namespace Opm {
 template <class TypeTag, bool enableEnergyV = getPropValue<TypeTag, Properties::EnableEnergy>()>
 class BlackOilEnergyModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     static constexpr unsigned temperatureIdx = Indices::temperatureIdx;
     static constexpr unsigned contiEnergyEqIdx = Indices::contiEnergyEqIdx;
@@ -327,18 +327,18 @@ public:
 template <class TypeTag, bool enableEnergyV = getPropValue<TypeTag, Properties::EnableEnergy>()>
 class BlackOilEnergyIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLaw> SolidEnergyLaw;
+    using SolidEnergyLaw = GetPropType<TypeTag, Properties::SolidEnergyLaw>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLaw> ThermalConductionLaw;
+    using ThermalConductionLaw = GetPropType<TypeTag, Properties::ThermalConductionLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef BlackOilEnergyModule<TypeTag> EnergyModule;
+    using EnergyModule = BlackOilEnergyModule<TypeTag>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     static constexpr int temperatureIdx = Indices::temperatureIdx;
@@ -407,12 +407,12 @@ protected:
 template <class TypeTag>
 class BlackOilEnergyIntensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
     static constexpr bool enableTemperature = getPropValue<TypeTag, Properties::EnableTemperature>();
 
@@ -460,23 +460,23 @@ protected:
 template <class TypeTag, bool enableEnergyV = getPropValue<TypeTag, Properties::EnableEnergy>()>
 class BlackOilEnergyExtensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
-    typedef BlackOilEnergyModule<TypeTag> EnergyModule;
+    using EnergyModule = BlackOilEnergyModule<TypeTag>;
 
     static const int dimWorld = GridView::dimensionworld;
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> DimEvalVector;
+    using DimEvalVector = Dune::FieldVector<Evaluation, dimWorld>;
 
 public:
     void updateEnergy(const ElementContext& elemCtx,
@@ -597,8 +597,8 @@ private:
 template <class TypeTag>
 class BlackOilEnergyExtensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
 
 public:
     void updateEnergy(const ElementContext& elemCtx OPM_UNUSED,

opm/models/blackoil/blackoilextensivequantities.hh

@@ -55,11 +55,11 @@ class BlackOilExtensiveQuantities
     , public BlackOilPolymerExtensiveQuantities<TypeTag>
     , public BlackOilEnergyExtensiveQuantities<TypeTag>
 {
-    typedef MultiPhaseBaseExtensiveQuantities<TypeTag> MultiPhaseParent;
+    using MultiPhaseParent = MultiPhaseBaseExtensiveQuantities<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     /*!

opm/models/blackoil/blackoilfoammodules.hh

@@ -60,22 +60,22 @@ namespace Opm {
 template <class TypeTag, bool enableFoamV = getPropValue<TypeTag, Properties::EnableFoam>()>
 class BlackOilFoamModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
-    typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
+    using TabulatedFunction = typename Opm::Tabulated1DFunction<Scalar>;
 
     static constexpr unsigned foamConcentrationIdx = Indices::foamConcentrationIdx;
     static constexpr unsigned contiFoamEqIdx = Indices::contiFoamEqIdx;
@@ -481,17 +481,17 @@ BlackOilFoamModule<TypeTag, enableFoam>::gasMobilityMultiplierTable_;
 template <class TypeTag, bool enableFoam = getPropValue<TypeTag, Properties::EnableFoam>()>
 class BlackOilFoamIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef BlackOilFoamModule<TypeTag> FoamModule;
+    using FoamModule = BlackOilFoamModule<TypeTag>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     static constexpr int foamConcentrationIdx = Indices::foamConcentrationIdx;
@@ -589,9 +589,9 @@ protected:
 template <class TypeTag>
 class BlackOilFoamIntensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
     void foamPropertiesUpdate_(const ElementContext& elemCtx OPM_UNUSED,

opm/models/blackoil/blackoilintensivequantities.hh

@@ -60,18 +60,18 @@ class BlackOilIntensiveQuantities
     , public BlackOilBrineIntensiveQuantities<TypeTag>
     , public BlackOilEnergyIntensiveQuantities<TypeTag>
 {
-    typedef GetPropType<TypeTag, Properties::DiscIntensiveQuantities> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::DiscIntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::FluxModule> FluxModule;
+    using FluxModule = GetPropType<TypeTag, Properties::FluxModule>;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
     enum { enableSolvent = getPropValue<TypeTag, Properties::EnableSolvent>() };
@@ -94,10 +94,10 @@ class BlackOilIntensiveQuantities
     static const bool compositionSwitchEnabled = Indices::gasEnabled;
     static const bool waterEnabled = Indices::waterEnabled;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef typename FluxModule::FluxIntensiveQuantities FluxIntensiveQuantities;
+    using FluxIntensiveQuantities = typename FluxModule::FluxIntensiveQuantities;
-    typedef Opm::BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableBrine, Indices::numPhases > FluidState;
+    using FluidState = Opm::BlackOilFluidState<Evaluation, FluidSystem, enableTemperature, enableEnergy, compositionSwitchEnabled,  enableBrine, Indices::numPhases >;
 
 public:
     BlackOilIntensiveQuantities()

opm/models/blackoil/blackoillocalresidual.hh

@@ -46,15 +46,15 @@ namespace Opm {
 template <class TypeTag>
 class BlackOilLocalResidual : public GetPropType<TypeTag, Properties::DiscLocalResidual>
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { conti0EqIdx = Indices::conti0EqIdx };
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
@@ -78,12 +78,12 @@ class BlackOilLocalResidual : public GetPropType<TypeTag, Properties::DiscLocalR
     static constexpr bool blackoilConserveSurfaceVolume = getPropValue<TypeTag, Properties::BlackoilConserveSurfaceVolume>();
     static constexpr bool enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>();
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef BlackOilSolventModule<TypeTag> SolventModule;
+    using SolventModule = BlackOilSolventModule<TypeTag>;
-    typedef BlackOilPolymerModule<TypeTag> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag>;
-    typedef BlackOilEnergyModule<TypeTag> EnergyModule;
+    using EnergyModule = BlackOilEnergyModule<TypeTag>;
-    typedef BlackOilFoamModule<TypeTag> FoamModule;
+    using FoamModule = BlackOilFoamModule<TypeTag>;
-    typedef BlackOilBrineModule<TypeTag> BrineModule;
+    using BrineModule = BlackOilBrineModule<TypeTag>;
 
 public:
     /*!

opm/models/blackoil/blackoilmodel.hh

@@ -134,11 +134,11 @@ template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::BlackOilModel>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
 
 public:
-    typedef Opm::BlackOilFluidSystem<Scalar> type;
+    using type = Opm::BlackOilFluidSystem<Scalar>;
 };
 
 // by default, all ECL extension modules are disabled
@@ -169,11 +169,11 @@ template<class TypeTag>
 struct BlackOilEnergyScalingFactor<TypeTag, TTag::BlackOilModel>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     static constexpr Scalar alpha = getPropValue<TypeTag, Properties::BlackoilConserveSurfaceVolume>() ? 1000.0 : 1.0;
 
 public:
-    typedef Scalar type;
+    using type = Scalar;
     static constexpr Scalar value = 1.0/(30.0*4184.0*alpha);
 };
 
@@ -253,16 +253,16 @@ template<class TypeTag >
 class BlackOilModel
     : public MultiPhaseBaseModel<TypeTag>
 {
-    typedef GetPropType<TypeTag, Properties::Model> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Model>;
-    typedef MultiPhaseBaseModel<TypeTag> ParentType;
+    using ParentType = MultiPhaseBaseModel<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Discretization> Discretization;
+    using Discretization = GetPropType<TypeTag, Properties::Discretization>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     enum { numComponents = FluidSystem::numComponents };
@@ -271,9 +271,9 @@ class BlackOilModel
     static const bool compositionSwitchEnabled = Indices::gasEnabled;
     static const bool waterEnabled = Indices::waterEnabled;
 
-    typedef BlackOilSolventModule<TypeTag> SolventModule;
+    using SolventModule = BlackOilSolventModule<TypeTag>;
-    typedef BlackOilPolymerModule<TypeTag> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag>;
-    typedef BlackOilEnergyModule<TypeTag> EnergyModule;
+    using EnergyModule = BlackOilEnergyModule<TypeTag>;
 public:
     BlackOilModel(Simulator& simulator)
         : ParentType(simulator)
@@ -504,7 +504,7 @@ public:
         PolymerModule::deserializeEntity(*this, instream, dof);
         EnergyModule::deserializeEntity(*this, instream, dof);
 
-        typedef typename PrimaryVariables::PrimaryVarsMeaning PVM;
+        using PVM = typename PrimaryVariables::PrimaryVarsMeaning;
         priVars.setPrimaryVarsMeaning(static_cast<PVM>(primaryVarsMeaning));
         priVars.setPvtRegionIndex(pvtRegionIdx);
     }

opm/models/blackoil/blackoilnewtonmethod.hh

@@ -82,15 +82,15 @@ namespace Opm {
 template <class TypeTag>
 class BlackOilNewtonMethod : public GetPropType<TypeTag, Properties::DiscNewtonMethod>
 {
-    typedef GetPropType<TypeTag, Properties::DiscNewtonMethod> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::DiscNewtonMethod>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::SolutionVector> SolutionVector;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    typedef GetPropType<TypeTag, Properties::GlobalEqVector> GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Linearizer> Linearizer;
+    using Linearizer = GetPropType<TypeTag, Properties::Linearizer>;
 
     static const unsigned numEq = getPropValue<TypeTag, Properties::NumEq>();
 

opm/models/blackoil/blackoilpolymermodules.hh

@@ -61,23 +61,23 @@ namespace Opm {
 template <class TypeTag, bool enablePolymerV = getPropValue<TypeTag, Properties::EnablePolymer>()>
 class BlackOilPolymerModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
-    typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
+    using TabulatedFunction = typename Opm::Tabulated1DFunction<Scalar>;
-    typedef typename Opm::IntervalTabulated2DFunction<Scalar> TabulatedTwoDFunction;
+    using TabulatedTwoDFunction = typename Opm::IntervalTabulated2DFunction<Scalar>;
 
     static constexpr unsigned polymerConcentrationIdx = Indices::polymerConcentrationIdx;
     static constexpr unsigned polymerMoleWeightIdx = Indices::polymerMoleWeightIdx;
@@ -834,7 +834,7 @@ public:
                                          unsigned pvtnumRegionIdx,
                                          const Evaluation& v0)
     {
-        typedef Opm::MathToolbox<Evaluation> ToolboxLocal;
+        using ToolboxLocal = Opm::MathToolbox<Evaluation>;
 
         const auto& viscosityMultiplierTable = plyviscViscosityMultiplierTable_[pvtnumRegionIdx];
         Scalar viscosityMultiplier = viscosityMultiplierTable.eval(Opm::scalarValue(polymerConcentration), /*extrapolate=*/true);
@@ -1014,17 +1014,17 @@ BlackOilPolymerModule<TypeTag, enablePolymerV>::skprpolyTables_;
 template <class TypeTag, bool enablePolymerV = getPropValue<TypeTag, Properties::EnablePolymer>()>
 class BlackOilPolymerIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef BlackOilPolymerModule<TypeTag> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     static constexpr int polymerConcentrationIdx = Indices::polymerConcentrationIdx;
@@ -1154,9 +1154,9 @@ protected:
 template <class TypeTag>
 class BlackOilPolymerIntensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
     void polymerPropertiesUpdate_(const ElementContext& elemCtx OPM_UNUSED,
@@ -1197,24 +1197,24 @@ public:
 template <class TypeTag, bool enablePolymerV = getPropValue<TypeTag, Properties::EnablePolymer>()>
 class BlackOilPolymerExtensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     static constexpr unsigned gasPhaseIdx = FluidSystem::gasPhaseIdx;
     static constexpr int dimWorld = GridView::dimensionworld;
     static constexpr unsigned waterPhaseIdx =  FluidSystem::waterPhaseIdx;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef BlackOilPolymerModule<TypeTag> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag>;
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> DimEvalVector;
+    using DimEvalVector = Dune::FieldVector<Evaluation, dimWorld>;
 
 public:
     /*!
@@ -1320,8 +1320,8 @@ private:
 template <class TypeTag>
 class BlackOilPolymerExtensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
 
 public:
     void updateShearMultipliers(const ElementContext& elemCtx OPM_UNUSED,

opm/models/blackoil/blackoilprimaryvariables.hh

@@ -63,16 +63,16 @@ class BlackOilBrineModule;
 template <class TypeTag>
 class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
 {
-    typedef FvBasePrimaryVariables<TypeTag> ParentType;
+    using ParentType = FvBasePrimaryVariables<TypeTag>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::PrimaryVariables>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::Problem> Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
     // number of equations
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
@@ -102,13 +102,13 @@ class BlackOilPrimaryVariables : public FvBasePrimaryVariables<TypeTag>
     enum { waterCompIdx = FluidSystem::waterCompIdx };
     enum { oilCompIdx = FluidSystem::oilCompIdx };
 
-    typedef typename Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = typename Opm::MathToolbox<Evaluation>;
-    typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
+    using ComponentVector = Dune::FieldVector<Scalar, numComponents>;
-    typedef BlackOilSolventModule<TypeTag, enableSolvent> SolventModule;
+    using SolventModule = BlackOilSolventModule<TypeTag, enableSolvent>;
-    typedef BlackOilPolymerModule<TypeTag, enablePolymer> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag, enablePolymer>;
-    typedef BlackOilEnergyModule<TypeTag, enableEnergy> EnergyModule;
+    using EnergyModule = BlackOilEnergyModule<TypeTag, enableEnergy>;
-    typedef BlackOilFoamModule<TypeTag, enableFoam> FoamModule;
+    using FoamModule = BlackOilFoamModule<TypeTag, enableFoam>;
-    typedef BlackOilBrineModule<TypeTag, enableBrine> BrineModule;
+    using BrineModule = BlackOilBrineModule<TypeTag, enableBrine>;
 
     static_assert(numPhases == 3, "The black-oil model assumes three phases!");
     static_assert(numComponents == 3, "The black-oil model assumes three components!");
@@ -182,9 +182,9 @@ public:
                                 const MaterialLawParams& matParams,
                                 bool isInEquilibrium = false)
     {
-        typedef typename std::remove_reference<typename FluidState::Scalar>::type ConstEvaluation;
+        using ConstEvaluation = typename std::remove_reference<typename FluidState::Scalar>::type;
-        typedef typename std::remove_const<ConstEvaluation>::type FsEvaluation;
+        using FsEvaluation = typename std::remove_const<ConstEvaluation>::type;
-        typedef typename Opm::MathToolbox<FsEvaluation> FsToolbox;
+        using FsToolbox = typename Opm::MathToolbox<FsEvaluation>;
 
 #ifndef NDEBUG
         // make sure the temperature is the same in all fluid phases
@@ -210,8 +210,8 @@ public:
         paramCache.setMaxOilSat(FsToolbox::value(fluidState.saturation(oilPhaseIdx)));
 
         // create a mutable fluid state with well defined densities based on the input
-        typedef Opm::NcpFlash<Scalar, FluidSystem> NcpFlash;
+        using NcpFlash = Opm::NcpFlash<Scalar, FluidSystem>;
-        typedef Opm::CompositionalFluidState<Scalar, FluidSystem> FlashFluidState;
+        using FlashFluidState = Opm::CompositionalFluidState<Scalar, FluidSystem>;
         FlashFluidState fsFlash;
         fsFlash.setTemperature(FsToolbox::value(fluidState.temperature(/*phaseIdx=*/0)));
         for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
@@ -258,9 +258,9 @@ public:
     template <class FluidState>
     void assignNaive(const FluidState& fluidState)
     {
-        typedef typename std::remove_reference<typename FluidState::Scalar>::type ConstEvaluation;
+        using ConstEvaluation = typename std::remove_reference<typename FluidState::Scalar>::type;
-        typedef typename std::remove_const<ConstEvaluation>::type FsEvaluation;
+        using FsEvaluation = typename std::remove_const<ConstEvaluation>::type;
-        typedef typename Opm::MathToolbox<FsEvaluation> FsToolbox;
+        using FsToolbox = typename Opm::MathToolbox<FsEvaluation>;
 
         bool gasPresent = FluidSystem::phaseIsActive(gasPhaseIdx)?(fluidState.saturation(gasPhaseIdx) > 0.0):false;
         bool oilPresent = FluidSystem::phaseIsActive(oilPhaseIdx)?(fluidState.saturation(oilPhaseIdx) > 0.0):false;
@@ -725,18 +725,18 @@ private:
                                     Scalar Sw,
                                     const MaterialLawParams& matParams) const
     {
-        typedef Opm::SimpleModularFluidState<Scalar,
+        using SatOnlyFluidState = Opm::SimpleModularFluidState<Scalar,
-                                             numPhases,
+                                                               numPhases,
-                                             numComponents,
+                                                               numComponents,
-                                             FluidSystem,
+                                                               FluidSystem,
-                                             /*storePressure=*/false,
+                                                               /*storePressure=*/false,
-                                             /*storeTemperature=*/false,
+                                                               /*storeTemperature=*/false,
-                                             /*storeComposition=*/false,
+                                                               /*storeComposition=*/false,
-                                             /*storeFugacity=*/false,
+                                                               /*storeFugacity=*/false,
-                                             /*storeSaturation=*/true,
+                                                               /*storeSaturation=*/true,
-                                             /*storeDensity=*/false,
+                                                               /*storeDensity=*/false,
-                                             /*storeViscosity=*/false,
+                                                               /*storeViscosity=*/false,
-                                             /*storeEnthalpy=*/false> SatOnlyFluidState;
+                                                               /*storeEnthalpy=*/false>;
         SatOnlyFluidState fluidState;
         fluidState.setSaturation(waterPhaseIdx, Sw);
         fluidState.setSaturation(oilPhaseIdx, So);

opm/models/blackoil/blackoilproblem.hh

@@ -44,11 +44,11 @@ template<class TypeTag>
 class BlackOilProblem : public MultiPhaseBaseProblem<TypeTag>
 {
 private:
-    typedef MultiPhaseBaseProblem<TypeTag> ParentType;
+    using ParentType = MultiPhaseBaseProblem<TypeTag>;
-    typedef GetPropType<TypeTag, Properties::Problem> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
 public:
     /*!

opm/models/blackoil/blackoilratevector.hh

@@ -51,15 +51,15 @@ class BlackOilRateVector
     : public Dune::FieldVector<GetPropType<TypeTag, Properties::Evaluation>,
                                getPropValue<TypeTag, Properties::NumEq>()>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
-    typedef BlackOilSolventModule<TypeTag> SolventModule;
+    using SolventModule = BlackOilSolventModule<TypeTag>;
-    typedef BlackOilPolymerModule<TypeTag> PolymerModule;
+    using PolymerModule = BlackOilPolymerModule<TypeTag>;
-    typedef BlackOilFoamModule<TypeTag> FoamModule;
+    using FoamModule = BlackOilFoamModule<TypeTag>;
-    typedef BlackOilBrineModule<TypeTag> BrineModule;
+    using BrineModule = BlackOilBrineModule<TypeTag>;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
     enum { numComponents = getPropValue<TypeTag, Properties::NumComponents>() };
@@ -72,8 +72,8 @@ class BlackOilRateVector
     enum { enableFoam = getPropValue<TypeTag, Properties::EnableFoam>() };
     enum { enableBrine = getPropValue<TypeTag, Properties::EnableBrine>() };
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef Dune::FieldVector<Evaluation, numEq> ParentType;
+    using ParentType = Dune::FieldVector<Evaluation, numEq>;
 
 public:
     BlackOilRateVector() : ParentType()

opm/models/blackoil/blackoilsolventmodules.hh

@@ -65,23 +65,23 @@ namespace Opm {
 template <class TypeTag, bool enableSolventV = getPropValue<TypeTag, Properties::EnableSolvent>()>
 class BlackOilSolventModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef Opm::SolventPvt<Scalar> SolventPvt;
+    using SolventPvt = Opm::SolventPvt<Scalar>;
 
-    typedef typename Opm::Tabulated1DFunction<Scalar> TabulatedFunction;
+    using TabulatedFunction = typename Opm::Tabulated1DFunction<Scalar>;
 
     static constexpr unsigned solventSaturationIdx = Indices::solventSaturationIdx;
     static constexpr unsigned contiSolventEqIdx = Indices::contiSolventEqIdx;
@@ -869,17 +869,17 @@ BlackOilSolventModule<TypeTag, enableSolventV>::isMiscible_;
 template <class TypeTag, bool enableSolventV = getPropValue<TypeTag, Properties::EnableSolvent>()>
 class BlackOilSolventIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef BlackOilSolventModule<TypeTag> SolventModule;
+    using SolventModule = BlackOilSolventModule<TypeTag>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     static constexpr int solventSaturationIdx = Indices::solventSaturationIdx;
@@ -1265,9 +1265,9 @@ protected:
 template <class TypeTag>
 class BlackOilSolventIntensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 
 public:
@@ -1315,23 +1315,23 @@ public:
 template <class TypeTag, bool enableSolventV = getPropValue<TypeTag, Properties::EnableSolvent>()>
 class BlackOilSolventExtensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
     static constexpr unsigned gasPhaseIdx = FluidSystem::gasPhaseIdx;
     static constexpr int dimWorld = GridView::dimensionworld;
 
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> DimEvalVector;
+    using DimEvalVector = Dune::FieldVector<Evaluation, dimWorld>;
 
 public:
     /*!
@@ -1541,8 +1541,8 @@ private:
 template <class TypeTag>
 class BlackOilSolventExtensiveQuantities<TypeTag, false>
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
 
 public:
     void updateVolumeFluxPerm(const ElementContext& elemCtx OPM_UNUSED,

opm/models/common/darcyfluxmodule.hh

@@ -60,9 +60,9 @@ class DarcyBaseProblem;
 template <class TypeTag>
 struct DarcyFluxModule
 {
-    typedef DarcyIntensiveQuantities<TypeTag> FluxIntensiveQuantities;
+    using FluxIntensiveQuantities = DarcyIntensiveQuantities<TypeTag>;
-    typedef DarcyExtensiveQuantities<TypeTag> FluxExtensiveQuantities;
+    using FluxExtensiveQuantities = DarcyExtensiveQuantities<TypeTag>;
-    typedef DarcyBaseProblem<TypeTag> FluxBaseProblem;
+    using FluxBaseProblem = DarcyBaseProblem<TypeTag>;
 
     /*!
      * \brief Register all run-time parameters for the flux module.
@@ -87,7 +87,7 @@ class DarcyBaseProblem
 template <class TypeTag>
 class DarcyIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 protected:
     void update_(const ElementContext& elemCtx OPM_UNUSED,
                  unsigned dofIdx OPM_UNUSED,
@@ -114,22 +114,22 @@ protected:
 template <class TypeTag>
 class DarcyExtensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
 
-    typedef typename Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = typename Opm::MathToolbox<Evaluation>;
-    typedef typename FluidSystem::template ParameterCache<Evaluation> ParameterCache;
+    using ParameterCache = typename FluidSystem::template ParameterCache<Evaluation>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> EvalDimVector;
+    using EvalDimVector = Dune::FieldVector<Evaluation, dimWorld>;
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

opm/models/common/diffusionmodule.hh

@@ -54,9 +54,9 @@ class DiffusionModule;
 template <class TypeTag>
 class DiffusionModule<TypeTag, /*enableDiffusion=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
 
 public:
     /*!
@@ -83,17 +83,17 @@ public:
 template <class TypeTag>
 class DiffusionModule<TypeTag, /*enableDiffusion=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { numComponents = FluidSystem::numComponents };
     enum { conti0EqIdx = Indices::conti0EqIdx };
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
 public:
     /*!
@@ -147,9 +147,9 @@ class DiffusionIntensiveQuantities;
 template <class TypeTag>
 class DiffusionIntensiveQuantities<TypeTag, /*enableDiffusion=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
 public:
     /*!
@@ -202,10 +202,10 @@ protected:
 template <class TypeTag>
 class DiffusionIntensiveQuantities<TypeTag, /*enableDiffusion=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { numComponents = FluidSystem::numComponents };
@@ -244,7 +244,7 @@ protected:
                  unsigned dofIdx,
                  unsigned timeIdx)
     {
-        typedef Opm::MathToolbox<Evaluation> Toolbox;
+        using Toolbox = Opm::MathToolbox<Evaluation>;
 
         const auto& intQuants = elemCtx.intensiveQuantities(dofIdx, timeIdx);
         for (unsigned phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
@@ -292,9 +292,9 @@ class DiffusionExtensiveQuantities;
 template <class TypeTag>
 class DiffusionExtensiveQuantities<TypeTag, /*enableDiffusion=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
 protected:
     /*!
@@ -348,17 +348,17 @@ public:
 template <class TypeTag>
 class DiffusionExtensiveQuantities<TypeTag, /*enableDiffusion=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     enum { numComponents = getPropValue<TypeTag, Properties::NumComponents>() };
 
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> DimEvalVector;
+    using DimEvalVector = Dune::FieldVector<Evaluation, dimWorld>;
 
 protected:
     /*!

opm/models/common/energymodule.hh

@@ -55,18 +55,18 @@ class EnergyModule;
 template <class TypeTag>
 class EnergyModule<TypeTag, /*enableEnergy=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
 
-    typedef Dune::FieldVector<Evaluation, numEq> EvalEqVector;
+    using EvalEqVector = Dune::FieldVector<Evaluation, numEq>;
 
 public:
     /*!
@@ -222,24 +222,24 @@ public:
 template <class TypeTag>
 class EnergyModule<TypeTag, /*enableEnergy=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
     enum { numPhases = FluidSystem::numPhases };
     enum { energyEqIdx = Indices::energyEqIdx };
     enum { temperatureIdx = Indices::temperatureIdx };
 
-    typedef Dune::FieldVector<Evaluation, numEq> EvalEqVector;
+    using EvalEqVector = Dune::FieldVector<Evaluation, numEq>;
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
 public:
     /*!
@@ -537,12 +537,12 @@ class EnergyIntensiveQuantities;
 template <class TypeTag>
 class EnergyIntensiveQuantities<TypeTag, /*enableEnergy=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
 public:
     /*!
@@ -596,19 +596,19 @@ protected:
 template <class TypeTag>
 class EnergyIntensiveQuantities<TypeTag, /*enableEnergy=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLaw> ThermalConductionLaw;
+    using ThermalConductionLaw = GetPropType<TypeTag, Properties::ThermalConductionLaw>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLaw> SolidEnergyLaw;
+    using SolidEnergyLaw = GetPropType<TypeTag, Properties::SolidEnergyLaw>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { energyEqIdx = Indices::energyEqIdx };
     enum { temperatureIdx = Indices::temperatureIdx };
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
 protected:
     /*!
@@ -701,8 +701,8 @@ class EnergyExtensiveQuantities;
 template <class TypeTag>
 class EnergyExtensiveQuantities<TypeTag, /*enableEnergy=*/false>
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
 protected:
     /*!
@@ -747,14 +747,14 @@ public:
 template <class TypeTag>
 class EnergyExtensiveQuantities<TypeTag, /*enableEnergy=*/true>
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     enum { dimWorld = GridView::dimensionworld };
-    typedef Dune::FieldVector<Evaluation, dimWorld> EvalDimVector;
+    using EvalDimVector = Dune::FieldVector<Evaluation, dimWorld>;
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
 
 protected:
     /*!

opm/models/common/forchheimerfluxmodule.hh

@@ -60,9 +60,9 @@ class ForchheimerBaseProblem;
 template <class TypeTag>
 struct ForchheimerFluxModule
 {
-    typedef ForchheimerIntensiveQuantities<TypeTag> FluxIntensiveQuantities;
+    using FluxIntensiveQuantities = ForchheimerIntensiveQuantities<TypeTag>;
-    typedef ForchheimerExtensiveQuantities<TypeTag> FluxExtensiveQuantities;
+    using FluxExtensiveQuantities = ForchheimerExtensiveQuantities<TypeTag>;
-    typedef ForchheimerBaseProblem<TypeTag> FluxBaseProblem;
+    using FluxBaseProblem = ForchheimerBaseProblem<TypeTag>;
 
     /*!
      * \brief Register all run-time parameters for the flux module.
@@ -79,8 +79,8 @@ struct ForchheimerFluxModule
 template <class TypeTag>
 class ForchheimerBaseProblem
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
 
 public:
     /*!
@@ -128,9 +128,9 @@ public:
 template <class TypeTag>
 class ForchheimerIntensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
 
@@ -213,24 +213,24 @@ template <class TypeTag>
 class ForchheimerExtensiveQuantities
     : public DarcyExtensiveQuantities<TypeTag>
 {
-    typedef DarcyExtensiveQuantities<TypeTag> DarcyExtQuants;
+    using DarcyExtQuants = DarcyExtensiveQuantities<TypeTag>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
 
-    typedef Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
 
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldVector<Evaluation, dimWorld> DimEvalVector;
+    using DimEvalVector = Dune::FieldVector<Evaluation, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef Dune::FieldMatrix<Evaluation, dimWorld, dimWorld> DimEvalMatrix;
+    using DimEvalMatrix = Dune::FieldMatrix<Evaluation, dimWorld, dimWorld>;
 
 public:
     /*!

opm/models/common/multiphasebaseextensivequantities.hh

@@ -51,15 +51,15 @@ class MultiPhaseBaseExtensiveQuantities
     : public GetPropType<TypeTag, Properties::DiscExtensiveQuantities>
     , public GetPropType<TypeTag, Properties::FluxModule>::FluxExtensiveQuantities
 {
-    typedef GetPropType<TypeTag, Properties::DiscExtensiveQuantities> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::DiscExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
 
-    typedef GetPropType<TypeTag, Properties::FluxModule> FluxModule;
+    using FluxModule = GetPropType<TypeTag, Properties::FluxModule>;
-    typedef typename FluxModule::FluxExtensiveQuantities FluxExtensiveQuantities;
+    using FluxExtensiveQuantities = typename FluxModule::FluxExtensiveQuantities;
 
 public:
     /*!

opm/models/common/multiphasebasemodel.hh

@@ -96,12 +96,12 @@ template<class TypeTag>
 struct MaterialLaw<TypeTag, TTag::MultiPhaseBaseModel>
 {
 private:
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef Opm::NullMaterialTraits<Scalar, FluidSystem::numPhases> Traits;
+    using Traits = Opm::NullMaterialTraits<Scalar, FluidSystem::numPhases>;
 
 public:
-    typedef Opm::NullMaterial<Traits> type;
+    using type = Opm::NullMaterial<Traits>;
 };
 
 /*!
@@ -152,19 +152,19 @@ namespace Opm {
 template <class TypeTag>
 class MultiPhaseBaseModel : public GetPropType<TypeTag, Properties::Discretization>
 {
-    typedef GetPropType<TypeTag, Properties::Discretization> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::Discretization>;
-    typedef GetPropType<TypeTag, Properties::Model> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::ThreadManager> ThreadManager;
+    using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
-    typedef typename GridView::template Codim<0>::Iterator ElementIterator;
+    using ElementIterator = typename GridView::template Codim<0>::Iterator;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     enum { numComponents = FluidSystem::numComponents };

opm/models/common/multiphasebaseproblem.hh

@@ -55,22 +55,22 @@ class MultiPhaseBaseProblem
     , public GetPropType<TypeTag, Properties::FluxModule>::FluxBaseProblem
 {
 //! \cond SKIP_THIS
-    typedef Opm::FvBaseProblem<TypeTag> ParentType;
+    using ParentType = Opm::FvBaseProblem<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::Problem> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::SolidEnergyLawParams> SolidEnergyLawParams;
+    using SolidEnergyLawParams = GetPropType<TypeTag, Properties::SolidEnergyLawParams>;
-    typedef GetPropType<TypeTag, Properties::ThermalConductionLawParams> ThermalConductionLawParams;
+    using ThermalConductionLawParams = GetPropType<TypeTag, Properties::ThermalConductionLawParams>;
-    typedef typename GetPropType<TypeTag, Properties::MaterialLaw>::Params MaterialLawParams;
+    using MaterialLawParams = typename GetPropType<TypeTag, Properties::MaterialLaw>::Params;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 //! \endcond
 
 public:
@@ -306,7 +306,7 @@ public:
      */
     unsigned markForGridAdaptation()
     {
-        typedef Opm::MathToolbox<Evaluation> Toolbox;
+        using Toolbox = Opm::MathToolbox<Evaluation>;
 
         unsigned numMarked = 0;
         ElementContext elemCtx( this->simulator() );

opm/models/common/quantitycallbacks.hh

@@ -46,15 +46,15 @@ namespace Opm {
 template <class TypeTag>
 class TemperatureCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef decltype(std::declval<IQFluidState>().temperature(0)) ResultRawType;
+    using ResultRawType = decltype(std::declval<IQFluidState>().temperature(0));
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     TemperatureCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -82,15 +82,15 @@ private:
 template <class TypeTag>
 class PressureCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef decltype(std::declval<IQFluidState>().pressure(0)) ResultRawType;
+    using ResultRawType = decltype(std::declval<IQFluidState>().pressure(0));
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     PressureCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -131,17 +131,17 @@ private:
 template <class TypeTag, class FluidState>
 class BoundaryPressureCallback
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQRawFluidState;
+    using IQRawFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef typename std::remove_const<typename std::remove_reference<IQRawFluidState>::type>::type IQFluidState;
+    using IQFluidState = typename std::remove_const<typename std::remove_reference<IQRawFluidState>::type>::type;
-    typedef typename IQFluidState::Scalar IQScalar;
+    using IQScalar = typename IQFluidState::Scalar;
-    typedef Opm::MathToolbox<IQScalar> Toolbox;
+    using Toolbox = Opm::MathToolbox<IQScalar>;
 
 public:
-    typedef IQScalar ResultType;
+    using ResultType = IQScalar;
 
     BoundaryPressureCallback(const ElementContext& elemCtx, const FluidState& boundaryFs)
         : elemCtx_(elemCtx)
@@ -193,15 +193,15 @@ private:
 template <class TypeTag>
 class DensityCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef decltype(std::declval<IQFluidState>().density(0)) ResultRawType;
+    using ResultRawType = decltype(std::declval<IQFluidState>().density(0));
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     DensityCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -242,14 +242,14 @@ private:
 template <class TypeTag>
 class MolarDensityCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
 
 public:
-    typedef decltype(std::declval<IQFluidState>().molarDensity(0)) ResultType;
+    using ResultType = decltype(std::declval<IQFluidState>().molarDensity(0));
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     MolarDensityCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -290,15 +290,15 @@ private:
 template <class TypeTag>
 class ViscosityCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef decltype(std::declval<IQFluidState>().viscosity(0)) ResultRawType;
+    using ResultRawType = decltype(std::declval<IQFluidState>().viscosity(0));
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     ViscosityCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -339,18 +339,18 @@ private:
 template <class TypeTag>
 class VelocityCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
-    typedef decltype(IntensiveQuantities().velocityCenter()) ResultRawType;
+    using ResultRawType = decltype(IntensiveQuantities().velocityCenter());
 
     enum { dim = GridView::dimensionworld };
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename ResultType::field_type ResultFieldType;
+    using ResultFieldType = typename ResultType::field_type;
-    typedef typename Opm::MathToolbox<ResultFieldType>::ValueType ResultFieldValueType;
+    using ResultFieldValueType = typename Opm::MathToolbox<ResultFieldType>::ValueType;
 
     VelocityCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -375,14 +375,14 @@ private:
 template <class TypeTag>
 class VelocityComponentCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(IntensiveQuantities().velocityCenter()[0]) ResultRawType;
+    using ResultRawType = decltype(IntensiveQuantities().velocityCenter()[0]);
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     VelocityComponentCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)
@@ -423,15 +423,15 @@ private:
 template <class TypeTag>
 class MoleFractionCallback
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
 
-    typedef decltype(std::declval<IntensiveQuantities>().fluidState()) IQFluidState;
+    using IQFluidState = decltype(std::declval<IntensiveQuantities>().fluidState());
-    typedef decltype(std::declval<IQFluidState>().moleFraction(0, 0)) ResultRawType;
+    using ResultRawType = decltype(std::declval<IQFluidState>().moleFraction(0, 0));
 
 public:
-    typedef typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type ResultType;
+    using ResultType = typename std::remove_const<typename std::remove_reference<ResultRawType>::type>::type;
-    typedef typename Opm::MathToolbox<ResultType>::ValueType ResultValueType;
+    using ResultValueType = typename Opm::MathToolbox<ResultType>::ValueType;
 
     MoleFractionCallback(const ElementContext& elemCtx)
         : elemCtx_(elemCtx)

opm/models/discretefracture/discretefractureextensivequantities.hh

@@ -44,18 +44,18 @@ namespace Opm {
 template <class TypeTag>
 class DiscreteFractureExtensiveQuantities : public ImmiscibleExtensiveQuantities<TypeTag>
 {
-    typedef ImmiscibleExtensiveQuantities<TypeTag> ParentType;
+    using ParentType = ImmiscibleExtensiveQuantities<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
 
     enum { dimWorld = GridView::dimensionworld };
     enum { numPhases = FluidSystem::numPhases };
 
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
+    using DimVector = Dune::FieldVector<Scalar, dimWorld>;
 
 public:
     /*!

opm/models/discretefracture/discretefractureintensivequantities.hh

@@ -47,12 +47,12 @@ namespace Opm {
 template <class TypeTag>
 class DiscreteFractureIntensiveQuantities : public ImmiscibleIntensiveQuantities<TypeTag>
 {
-    typedef ImmiscibleIntensiveQuantities<TypeTag> ParentType;
+    using ParentType = ImmiscibleIntensiveQuantities<TypeTag>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::FluidSystem> FluidSystem;
+    using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 
     enum { numPhases = FluidSystem::numPhases };
     enum { dimWorld = GridView::dimensionworld };
@@ -65,9 +65,9 @@ class DiscreteFractureIntensiveQuantities : public ImmiscibleIntensiveQuantities
     enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
     enum { wettingPhaseIdx = MaterialLaw::wettingPhaseIdx };
     enum { nonWettingPhaseIdx = MaterialLaw::nonWettingPhaseIdx };
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-    typedef Opm::ImmiscibleFluidState<Scalar, FluidSystem,
+    using FluidState = Opm::ImmiscibleFluidState<Scalar, FluidSystem,
-                                      /*storeEnthalpy=*/enableEnergy> FluidState;
+                                                 /*storeEnthalpy=*/enableEnergy>;
 
 public:
     DiscreteFractureIntensiveQuantities()

opm/models/discretefracture/discretefracturelocalresidual.hh

@@ -41,19 +41,19 @@ namespace Opm {
 template <class TypeTag>
 class DiscreteFractureLocalResidual : public ImmiscibleLocalResidual<TypeTag>
 {
-    typedef ImmiscibleLocalResidual<TypeTag> ParentType;
+    using ParentType = ImmiscibleLocalResidual<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Indices> Indices;
+    using Indices = GetPropType<TypeTag, Properties::Indices>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
     enum { conti0EqIdx = Indices::conti0EqIdx };
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
     enum { enableEnergy = getPropValue<TypeTag, Properties::EnableEnergy>() };
 
-    typedef Opm::EnergyModule<TypeTag, enableEnergy> EnergyModule;
+    using EnergyModule = Opm::EnergyModule<TypeTag, enableEnergy>;
 
 public:
     /*!

opm/models/discretefracture/discretefracturemodel.hh

@@ -126,8 +126,8 @@ namespace Opm {
 template <class TypeTag>
 class DiscreteFractureModel : public ImmiscibleModel<TypeTag>
 {
-    typedef ImmiscibleModel<TypeTag> ParentType;
+    using ParentType = ImmiscibleModel<TypeTag>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
 public:
     DiscreteFractureModel(Simulator& simulator)

opm/models/discretefracture/discretefractureprimaryvariables.hh

@@ -43,11 +43,11 @@ template <class TypeTag>
 class DiscreteFracturePrimaryVariables
     : public ImmisciblePrimaryVariables<TypeTag>
 {
-    typedef ImmisciblePrimaryVariables<TypeTag> ParentType;
+    using ParentType = ImmisciblePrimaryVariables<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::MaterialLaw> MaterialLaw;
+    using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
-    typedef GetPropType<TypeTag, Properties::MaterialLawParams> MaterialLawParams;
+    using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
 
     enum { numPhases = getPropValue<TypeTag, Properties::NumPhases>() };
 

opm/models/discretefracture/discretefractureproblem.hh

@@ -50,15 +50,15 @@ template<class TypeTag>
 class DiscreteFractureProblem
     : public MultiPhaseBaseProblem<TypeTag>
 {
-    typedef Opm::MultiPhaseBaseProblem<TypeTag> ParentType;
+    using ParentType = Opm::MultiPhaseBaseProblem<TypeTag>;
 
-    typedef GetPropType<TypeTag, Properties::Problem> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
 
     enum { dimWorld = GridView::dimensionworld };
-    typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
+    using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
 public:
     /*!

opm/models/discretization/common/baseauxiliarymodule.hh

@@ -53,13 +53,13 @@ namespace Opm {
 template <class TypeTag>
 class BaseAuxiliaryModule
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::GlobalEqVector> GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef GetPropType<TypeTag, Properties::SparseMatrixAdapter> SparseMatrixAdapter;
+    using SparseMatrixAdapter = GetPropType<TypeTag, Properties::SparseMatrixAdapter>;
 
 protected:
-    typedef std::set<unsigned> NeighborSet;
+    using NeighborSet = std::set<unsigned>;
 
 public:
     virtual ~BaseAuxiliaryModule()

opm/models/discretization/common/fvbaseadlocallinearizer.hh

@@ -66,10 +66,10 @@ struct Evaluation<TypeTag, TTag::AutoDiffLocalLinearizer>
 private:
     static const unsigned numEq = getPropValue<TypeTag, Properties::NumEq>();
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 
 public:
-    typedef Opm::DenseAd::Evaluation<Scalar, numEq> type;
+    using type = Opm::DenseAd::Evaluation<Scalar, numEq>;
 };
 
 } // namespace Opm::Properties
@@ -88,25 +88,25 @@ template<class TypeTag>
 class FvBaseAdLocalLinearizer
 {
 private:
-    typedef GetPropType<TypeTag, Properties::LocalLinearizer> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::LocalLinearizer>;
-    typedef GetPropType<TypeTag, Properties::LocalResidual> LocalResidual;
+    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Problem> Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
 
     enum { numEq = getPropValue<TypeTag, Properties::NumEq>() };
 
-    typedef Dune::FieldVector<Scalar, numEq> ScalarVectorBlock;
+    using ScalarVectorBlock = Dune::FieldVector<Scalar, numEq>;
     // extract local matrices from jacobian matrix for consistency
-    typedef typename GetPropType<TypeTag, Properties::SparseMatrixAdapter>::MatrixBlock ScalarMatrixBlock;
+    using ScalarMatrixBlock = typename GetPropType<TypeTag, Properties::SparseMatrixAdapter>::MatrixBlock;
 
-    typedef Dune::BlockVector<ScalarVectorBlock> ScalarLocalBlockVector;
+    using ScalarLocalBlockVector = Dune::BlockVector<ScalarVectorBlock>;
-    typedef Dune::Matrix<ScalarMatrixBlock> ScalarLocalBlockMatrix;
+    using ScalarLocalBlockMatrix = Dune::Matrix<ScalarMatrixBlock>;
 
 public:
     FvBaseAdLocalLinearizer()

opm/models/discretization/common/fvbaseboundarycontext.hh

@@ -44,26 +44,26 @@ namespace Opm {
 template<class TypeTag>
 class FvBaseBoundaryContext
 {
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Problem> Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Stencil> Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::GradientCalculator> GradientCalculator;
+    using GradientCalculator = GetPropType<TypeTag, Properties::GradientCalculator>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
-    typedef typename GridView::IntersectionIterator IntersectionIterator;
+    using IntersectionIterator = typename GridView::IntersectionIterator;
-    typedef typename GridView::Intersection Intersection;
+    using Intersection = typename GridView::Intersection;
 
     enum { dim = GridView::dimension };
     enum { dimWorld = GridView::dimensionworld };
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
-    typedef Dune::FieldVector<Scalar, dimWorld> Vector;
+    using Vector = Dune::FieldVector<Scalar, dimWorld>;
 
 public:
     /*!

opm/models/discretization/common/fvbaseconstraints.hh

@@ -44,7 +44,7 @@ namespace Opm {
 template <class TypeTag>
 class FvBaseConstraints : public GetPropType<TypeTag, Properties::PrimaryVariables>
 {
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> ParentType;
+    using ParentType = GetPropType<TypeTag, Properties::PrimaryVariables>;
 
 public:
     FvBaseConstraints()

opm/models/discretization/common/fvbaseconstraintscontext.hh

@@ -42,16 +42,16 @@ namespace Opm {
 template<class TypeTag>
 class FvBaseConstraintsContext
 {
-    typedef GetPropType<TypeTag, Properties::Problem> Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
 
     enum { dimWorld = GridView::dimensionworld };
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
 public:
     /*!

opm/models/discretization/common/fvbasediscretization.hh

@@ -106,10 +106,10 @@ struct ElementMapper<TypeTag, TTag::FvBaseDiscretization>
 template<class TypeTag>
 struct BorderListCreator<TypeTag, TTag::FvBaseDiscretization>
 {
-    typedef GetPropType<TypeTag, Properties::DofMapper> DofMapper;
+    using DofMapper = GetPropType<TypeTag, Properties::DofMapper>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
 public:
-    typedef Opm::Linear::NullBorderListCreator<GridView, DofMapper> type;
+    using type = Opm::Linear::NullBorderListCreator<GridView, DofMapper>;
 };
 
 template<class TypeTag>
@@ -334,52 +334,52 @@ namespace Opm {
 template<class TypeTag>
 class FvBaseDiscretization
 {
-    typedef GetPropType<TypeTag, Properties::Model> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Discretization> Discretization;
+    using Discretization = GetPropType<TypeTag, Properties::Discretization>;
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Grid> Grid;
+    using Grid = GetPropType<TypeTag, Properties::Grid>;
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::Evaluation> Evaluation;
+    using Evaluation = GetPropType<TypeTag, Properties::Evaluation>;
-    typedef GetPropType<TypeTag, Properties::ElementMapper> ElementMapper;
+    using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
-    typedef GetPropType<TypeTag, Properties::VertexMapper> VertexMapper;
+    using VertexMapper = GetPropType<TypeTag, Properties::VertexMapper>;
-    typedef GetPropType<TypeTag, Properties::DofMapper> DofMapper;
+    using DofMapper = GetPropType<TypeTag, Properties::DofMapper>;
-    typedef GetPropType<TypeTag, Properties::SolutionVector> SolutionVector;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    typedef GetPropType<TypeTag, Properties::GlobalEqVector> GlobalEqVector;
+    using GlobalEqVector = GetPropType<TypeTag, Properties::GlobalEqVector>;
-    typedef GetPropType<TypeTag, Properties::EqVector> EqVector;
+    using EqVector = GetPropType<TypeTag, Properties::EqVector>;
-    typedef GetPropType<TypeTag, Properties::RateVector> RateVector;
+    using RateVector = GetPropType<TypeTag, Properties::RateVector>;
-    typedef GetPropType<TypeTag, Properties::BoundaryRateVector> BoundaryRateVector;
+    using BoundaryRateVector = GetPropType<TypeTag, Properties::BoundaryRateVector>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::Linearizer> Linearizer;
+    using Linearizer = GetPropType<TypeTag, Properties::Linearizer>;
-    typedef GetPropType<TypeTag, Properties::ElementContext> ElementContext;
+    using ElementContext = GetPropType<TypeTag, Properties::ElementContext>;
-    typedef GetPropType<TypeTag, Properties::BoundaryContext> BoundaryContext;
+    using BoundaryContext = GetPropType<TypeTag, Properties::BoundaryContext>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::GradientCalculator> GradientCalculator;
+    using GradientCalculator = GetPropType<TypeTag, Properties::GradientCalculator>;
-    typedef GetPropType<TypeTag, Properties::Stencil> Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef GetPropType<TypeTag, Properties::DiscBaseOutputModule> DiscBaseOutputModule;
+    using DiscBaseOutputModule = GetPropType<TypeTag, Properties::DiscBaseOutputModule>;
-    typedef GetPropType<TypeTag, Properties::GridCommHandleFactory> GridCommHandleFactory;
+    using GridCommHandleFactory = GetPropType<TypeTag, Properties::GridCommHandleFactory>;
-    typedef GetPropType<TypeTag, Properties::NewtonMethod> NewtonMethod;
+    using NewtonMethod = GetPropType<TypeTag, Properties::NewtonMethod>;
-    typedef GetPropType<TypeTag, Properties::ThreadManager> ThreadManager;
+    using ThreadManager = GetPropType<TypeTag, Properties::ThreadManager>;
 
-    typedef GetPropType<TypeTag, Properties::LocalLinearizer> LocalLinearizer;
+    using LocalLinearizer = GetPropType<TypeTag, Properties::LocalLinearizer>;
-    typedef GetPropType<TypeTag, Properties::LocalResidual> LocalResidual;
+    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
 
     enum {
         numEq = getPropValue<TypeTag, Properties::NumEq>(),
         historySize = getPropValue<TypeTag, Properties::TimeDiscHistorySize>(),
     };
 
-    typedef std::vector<IntensiveQuantities, Opm::aligned_allocator<IntensiveQuantities, alignof(IntensiveQuantities)> > IntensiveQuantitiesVector;
+    using IntensiveQuantitiesVector = std::vector<IntensiveQuantities, Opm::aligned_allocator<IntensiveQuantities, alignof(IntensiveQuantities)> >;
 
-    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 Opm::MathToolbox<Evaluation> Toolbox;
+    using Toolbox = Opm::MathToolbox<Evaluation>;
-    typedef Dune::FieldVector<Evaluation, numEq> VectorBlock;
+    using VectorBlock = Dune::FieldVector<Evaluation, numEq>;
-    typedef Dune::FieldVector<Evaluation, numEq> EvalEqVector;
+    using EvalEqVector = Dune::FieldVector<Evaluation, numEq>;
 
-    typedef typename LocalResidual::LocalEvalBlockVector LocalEvalBlockVector;
+    using LocalEvalBlockVector = typename LocalResidual::LocalEvalBlockVector;
 
     class BlockVectorWrapper
     {
@@ -397,23 +397,23 @@ class FvBaseDiscretization
     };
 
 #if HAVE_DUNE_FEM
-    typedef GetPropType<TypeTag, Properties::DiscreteFunctionSpace>    DiscreteFunctionSpace;
+    using DiscreteFunctionSpace = GetPropType<TypeTag, Properties::DiscreteFunctionSpace>   ;
 
     // discrete function storing solution data
-    typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace, PrimaryVariables> DiscreteFunction;
+    using DiscreteFunction = Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace, PrimaryVariables>;
 
     // problem restriction and prolongation operator for adaptation
-    typedef GetPropType<TypeTag, Properties::Problem>   Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>  ;
-    typedef typename Problem :: RestrictProlongOperator  ProblemRestrictProlongOperator;
+    using ProblemRestrictProlongOperator = typename Problem :: RestrictProlongOperator ;
 
     // discrete function restriction and prolongation operator for adaptation
-    typedef Dune::Fem::RestrictProlongDefault< DiscreteFunction > DiscreteFunctionRestrictProlong;
+    using DiscreteFunctionRestrictProlong = Dune::Fem::RestrictProlongDefault< DiscreteFunction >;
-    typedef Dune::Fem::RestrictProlongTuple< DiscreteFunctionRestrictProlong,  ProblemRestrictProlongOperator > RestrictProlong;
+    using RestrictProlong = Dune::Fem::RestrictProlongTuple< DiscreteFunctionRestrictProlong,  ProblemRestrictProlongOperator >;
     // adaptation classes
-    typedef Dune::Fem::AdaptationManager<Grid, RestrictProlong  > AdaptationManager;
+    using AdaptationManager = Dune::Fem::AdaptationManager<Grid, RestrictProlong  >;
 #else
-    typedef BlockVectorWrapper  DiscreteFunction;
+    using DiscreteFunction = BlockVectorWrapper ;
-    typedef size_t              DiscreteFunctionSpace;
+    using DiscreteFunctionSpace = size_t             ;
 #endif
 
     // copying a discretization object is not a good idea
@@ -1604,7 +1604,7 @@ public:
                                  const SolutionVector& u,
                                  const GlobalEqVector& deltaU) const
     {
-        typedef std::vector<double> ScalarBuffer;
+        using ScalarBuffer = std::vector<double>;
 
         GlobalEqVector globalResid(u.size());
         asImp_().globalResidual(globalResid, u);

opm/models/discretization/common/fvbaseelementcontext.hh

@@ -50,12 +50,12 @@ namespace Opm {
 template<class TypeTag>
 class FvBaseElementContext
 {
-    typedef GetPropType<TypeTag, Properties::ElementContext> Implementation;
+    using Implementation = GetPropType<TypeTag, Properties::ElementContext>;
 
-    typedef GetPropType<TypeTag, Properties::Scalar> Scalar;
+    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    typedef GetPropType<TypeTag, Properties::PrimaryVariables> PrimaryVariables;
+    using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
-    typedef GetPropType<TypeTag, Properties::IntensiveQuantities> IntensiveQuantities;
+    using IntensiveQuantities = GetPropType<TypeTag, Properties::IntensiveQuantities>;
-    typedef GetPropType<TypeTag, Properties::ExtensiveQuantities> ExtensiveQuantities;
+    using ExtensiveQuantities = GetPropType<TypeTag, Properties::ExtensiveQuantities>;
 
     // the history size of the time discretization in number of steps
     enum { timeDiscHistorySize = getPropValue<TypeTag, Properties::TimeDiscHistorySize>() };
@@ -65,24 +65,24 @@ class FvBaseElementContext
         PrimaryVariables priVars[timeDiscHistorySize];
         const IntensiveQuantities *thermodynamicHint[timeDiscHistorySize];
     };
-    typedef std::vector<DofStore_> DofVarsVector;
+    using DofVarsVector = std::vector<DofStore_>;
-    typedef std::vector<ExtensiveQuantities> ExtensiveQuantitiesVector;
+    using ExtensiveQuantitiesVector = std::vector<ExtensiveQuantities>;
 
-    typedef GetPropType<TypeTag, Properties::Simulator> Simulator;
+    using Simulator = GetPropType<TypeTag, Properties::Simulator>;
-    typedef GetPropType<TypeTag, Properties::Problem> Problem;
+    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    typedef GetPropType<TypeTag, Properties::Model> Model;
+    using Model = GetPropType<TypeTag, Properties::Model>;
-    typedef GetPropType<TypeTag, Properties::Stencil> Stencil;
+    using Stencil = GetPropType<TypeTag, Properties::Stencil>;
-    typedef GetPropType<TypeTag, Properties::GradientCalculator> GradientCalculator;
+    using GradientCalculator = GetPropType<TypeTag, Properties::GradientCalculator>;
-    typedef GetPropType<TypeTag, Properties::SolutionVector> SolutionVector;
+    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
 
-    typedef GetPropType<TypeTag, Properties::GridView> GridView;
+    using GridView = GetPropType<TypeTag, Properties::GridView>;
-    typedef typename GridView::template Codim<0>::Entity Element;
+    using Element = typename GridView::template Codim<0>::Entity;
 
     static const unsigned dimWorld = GridView::dimensionworld;
     static const unsigned numEq = getPropValue<TypeTag, Properties::NumEq>();
 
-    typedef typename GridView::ctype CoordScalar;
+    using CoordScalar = typename GridView::ctype;
-    typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
+    using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
 
     // we don't allow copies of element contexts!
     FvBaseElementContext(const FvBaseElementContext& ) = delete;