diff --git a/dumux/material/spatialparams/sequentialfv.hh b/dumux/material/spatialparams/sequentialfv.hh index d6e7c6ecf8db6306e195d51d67f7f8e01ab56729..fafa8a703bfa4906aa9ab2b9d9727fe1f8201836 100644 --- a/dumux/material/spatialparams/sequentialfv.hh +++ b/dumux/material/spatialparams/sequentialfv.hh @@ -42,19 +42,19 @@ namespace Dumux template<class TypeTag> class SequentialFVSpatialParams: public SequentialFVSpatialParamsOneP<TypeTag> { - typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation; + using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); + using GridView = typename GET_PROP_TYPE(TypeTag, GridView); + using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams); enum { dimWorld = GridView::dimensionworld }; - typedef typename GridView::template Codim<0>::Entity Element; - typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition; + using Element = typename GridView::template Codim<0>::Entity; + using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>; /// @cond false - typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams; + using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params; /// @endcond public: diff --git a/dumux/material/spatialparams/sequentialfv1p.hh b/dumux/material/spatialparams/sequentialfv1p.hh index 4af5835a010e529ea5029ddcf9441e968f7502cf..211389183ce651a93043b5540195f27ae7329d99 100644 --- a/dumux/material/spatialparams/sequentialfv1p.hh +++ b/dumux/material/spatialparams/sequentialfv1p.hh @@ -51,9 +51,9 @@ NEW_PROP_TAG(SpatialParams); template<class TypeTag> class SequentialFVSpatialParamsOneP { - typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation; + using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); + using GridView = typename GET_PROP_TYPE(TypeTag, GridView); + using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams); enum { @@ -61,9 +61,9 @@ class SequentialFVSpatialParamsOneP dimWorld = GridView::dimensionworld }; - typedef typename GridView::template Codim<0>::Entity Element; - typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition; - typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimWorldMatrix; + using Element = typename GridView::template Codim<0>::Entity; + using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>; + using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>; public: SequentialFVSpatialParamsOneP(const GridView &gridView)