diff --git a/dumux/flux/box/darcyslaw.hh b/dumux/flux/box/darcyslaw.hh index fdf0f2ccff2ca705d52c3e487319bb75ec9d0a81..50cdbd6fadee67d83756af59201b9f3eb5ca7807 100644 --- a/dumux/flux/box/darcyslaw.hh +++ b/dumux/flux/box/darcyslaw.hh @@ -62,17 +62,13 @@ template<class Scalar, class GridGeometry> class BoxDarcysLaw { using FVElementGeometry = typename GridGeometry::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using CoordScalar = typename GridView::ctype; enum { dim = GridView::dimension}; enum { dimWorld = GridView::dimensionworld}; - using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>; - public: template<class Problem, class ElementVolumeVariables, class ElementFluxVarsCache> diff --git a/dumux/flux/box/effectivestresslaw.hh b/dumux/flux/box/effectivestresslaw.hh index 524d5cf294df71139f3f96b6c5edc3f37fd5628c..92d4c7c1909207541ffbcc6151efc85bf6e8e09b 100644 --- a/dumux/flux/box/effectivestresslaw.hh +++ b/dumux/flux/box/effectivestresslaw.hh @@ -41,7 +41,6 @@ template<class StressType, class GridGeometry> class EffectiveStressLaw<StressType, GridGeometry, DiscretizationMethod::box> { using FVElementGeometry = typename GridGeometry::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GridGeometry::GridView; diff --git a/dumux/flux/box/fickslaw.hh b/dumux/flux/box/fickslaw.hh index 00135004801abff257f1067478d54eb7c8014902..c6084d72f4df341a971d4bea21b4a2db2e1871f3 100644 --- a/dumux/flux/box/fickslaw.hh +++ b/dumux/flux/box/fickslaw.hh @@ -53,7 +53,6 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::box, referenceSystem using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView; using FluxVarCache = GetPropType<TypeTag, Properties::FluxVariablesCache>; @@ -61,7 +60,6 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::box, referenceSystem using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; using Element = typename GridView::template Codim<0>::Entity; using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>; - using Indices = typename ModelTraits::Indices; enum { dim = GridView::dimension} ; enum { dimWorld = GridView::dimensionworld} ; diff --git a/dumux/flux/box/fourierslaw.hh b/dumux/flux/box/fourierslaw.hh index 6ebf3aba1deb5aa6d2bb0e754c7e21f9e33b0daa..edb39e90def1cf7f2bc6b210e672984e7f591582 100644 --- a/dumux/flux/box/fourierslaw.hh +++ b/dumux/flux/box/fourierslaw.hh @@ -45,9 +45,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::box> { using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Problem = GetPropType<TypeTag, Properties::Problem>; - using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView; diff --git a/dumux/flux/box/fourierslawnonequilibrium.hh b/dumux/flux/box/fourierslawnonequilibrium.hh index 25ce9d0f036d020f6e51e2143215f6fb5a78c020..13083f4711fcc884fb391698a576234bcb6a817e 100644 --- a/dumux/flux/box/fourierslawnonequilibrium.hh +++ b/dumux/flux/box/fourierslawnonequilibrium.hh @@ -50,7 +50,6 @@ class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::box using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Problem = GetPropType<TypeTag, Properties::Problem>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView; diff --git a/dumux/flux/box/hookeslaw.hh b/dumux/flux/box/hookeslaw.hh index 3a15e59d3eaf1fde437eec34a30cbd529fa4befa..7d9af61c96bc62d0b1173b29748053ac296484f1 100644 --- a/dumux/flux/box/hookeslaw.hh +++ b/dumux/flux/box/hookeslaw.hh @@ -43,7 +43,6 @@ template<class ScalarType, class GridGeometry> class HookesLaw<ScalarType, GridGeometry, DiscretizationMethod::box> { using FVElementGeometry = typename GridGeometry::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GridGeometry::GridView; diff --git a/dumux/flux/box/maxwellstefanslaw.hh b/dumux/flux/box/maxwellstefanslaw.hh index 398c1afa583b991ad34a347239d17e92196c9b95..b2272f2d03a157feef7672c203dfdf6c810b06e0 100644 --- a/dumux/flux/box/maxwellstefanslaw.hh +++ b/dumux/flux/box/maxwellstefanslaw.hh @@ -54,7 +54,6 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::box, refere using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>; using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView; diff --git a/dumux/flux/cctpfa/fickslaw.hh b/dumux/flux/cctpfa/fickslaw.hh index e7b0039f1dee6786b3d0ca144e48a4b74bbb4f49..b1b13d12f68f31ee08155025ea12919ce7d0661e 100644 --- a/dumux/flux/cctpfa/fickslaw.hh +++ b/dumux/flux/cctpfa/fickslaw.hh @@ -53,10 +53,8 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::cctpfa, referenceSys using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Problem = GetPropType<TypeTag, Properties::Problem>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; - using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using Element = typename GridView::template Codim<0>::Entity; using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView; diff --git a/dumux/flux/cctpfa/fourierslaw.hh b/dumux/flux/cctpfa/fourierslaw.hh index 44c216116242fb817a99d25a0fd55f3924988133..ee48c6351985a03e09b40f8ce5089e673353fc10 100644 --- a/dumux/flux/cctpfa/fourierslaw.hh +++ b/dumux/flux/cctpfa/fourierslaw.hh @@ -49,7 +49,6 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::cctpfa> using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Problem = GetPropType<TypeTag, Properties::Problem>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; @@ -60,8 +59,6 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::cctpfa> static const int dim = GridView::dimension; static const int dimWorld = GridView::dimensionworld; - using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>; - //! Class that fills the cache corresponding to tpfa Fick's Law class TpfaFouriersLawCacheFiller { diff --git a/dumux/flux/cctpfa/fourierslawnonequilibrium.hh b/dumux/flux/cctpfa/fourierslawnonequilibrium.hh index b6bf153cde6c60731ace56bf5d8828f0bccc8cd5..6dc098cde2534b4f510bfd028318ce5808f7fcf4 100644 --- a/dumux/flux/cctpfa/fourierslawnonequilibrium.hh +++ b/dumux/flux/cctpfa/fourierslawnonequilibrium.hh @@ -47,7 +47,6 @@ class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::cct using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Problem = GetPropType<TypeTag, Properties::Problem>; using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView; - using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView; using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;