Merge branch 'cleanup/flux-laws' into 'master'

Cleanup/flux laws

See merge request !1940

dumux/flux/box/darcyslaw.hh

@@ -54,7 +54,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::box>
 
 /*!
  * \ingroup BoxFlux
- * \brief Darcy's law for box schemes
+ * \brief Darcy's law for the box scheme
  * \tparam Scalar the scalar type for scalar physical quantities
  * \tparam GridGeometry the grid geometry
  */
@@ -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>

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;

dumux/flux/box/fickslaw.hh

@@ -25,6 +25,9 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_FICKS_LAW_HH
 #define DUMUX_DISCRETIZATION_BOX_FICKS_LAW_HH
 
+#include <dune/common/fvector.hh>
+#include <dune/common/fmatrix.hh>
+
 #include <dumux/common/math.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/deprecated.hh>
@@ -53,7 +56,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 +63,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} ;

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;

dumux/flux/box/fourierslawnonequilibrium.hh

@@ -25,7 +25,7 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_FOURIERS_LAW_NONEQUILIBRIUM_HH
 #define DUMUX_DISCRETIZATION_BOX_FOURIERS_LAW_NONEQUILIBRIUM_HH
 
-#include <dune/common/float_cmp.hh>
+#include <dune/common/fvector.hh>
 
 #include <dumux/common/math.hh>
 #include <dumux/common/properties.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;

dumux/flux/box/hookeslaw.hh

@@ -27,7 +27,6 @@
 
 #include <dune/common/fmatrix.hh>
 
-#include <dumux/common/math.hh>
 #include <dumux/flux/hookeslaw.hh>
 #include <dumux/discretization/method.hh>
 
@@ -43,7 +42,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;

dumux/flux/box/maxwellstefanslaw.hh

@@ -26,8 +26,9 @@
 #define DUMUX_DISCRETIZATION_BOX_MAXWELL_STEFAN_LAW_HH
 
 #include <dune/common/float_cmp.hh>
+#include <dune/common/fmatrix.hh>
 
-#include <dumux/common/math.hh>
+#include <dumux/common/deprecated.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/method.hh>
@@ -54,7 +55,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;

dumux/flux/ccmpfa/fickslaw.hh

@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_CC_MPFA_FICKS_LAW_HH
 #define DUMUX_DISCRETIZATION_CC_MPFA_FICKS_LAW_HH
 
-#include <dumux/common/math.hh>
+#include <dune/common/fvector.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/discretization/method.hh>
 

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;

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
     {

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;

dumux/flux/cctpfa/maxwellstefanslaw.hh

@@ -25,14 +25,17 @@
 #ifndef DUMUX_DISCRETIZATION_CC_TPFA_MAXWELL_STEFAN_LAW_HH
 #define DUMUX_DISCRETIZATION_CC_TPFA_MAXWELL_STEFAN_LAW_HH
 
+#include <dune/common/fmatrix.hh>
 #include <dune/common/float_cmp.hh>
-#include <dumux/flux/maxwellstefandiffusioncoefficients.hh>
-#include <dumux/common/math.hh>
+
+#include <dumux/common/deprecated.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
+
 #include <dumux/discretization/method.hh>
 #include <dumux/flux/fluxvariablescaching.hh>
 #include <dumux/flux/referencesystemformulation.hh>
+#include <dumux/flux/maxwellstefandiffusioncoefficients.hh>
 
 namespace Dumux {
 

dumux/flux/shallowwater/riemannproblem.hh

@@ -25,6 +25,7 @@
 #ifndef DUMUX_FLUX_SHALLOW_WATER_RIEMANN_PROBLEM_HH
 #define DUMUX_FLUX_SHALLOW_WATER_RIEMANN_PROBLEM_HH
 
+#include <dumux/common/parameters.hh>
 #include <dumux/flux/shallowwater/fluxlimiterlet.hh>
 #include <dumux/flux/shallowwater/exactriemann.hh>
 

dumux/flux/staggered/freeflow/fickslaw.hh

@@ -28,6 +28,7 @@
 #include <numeric>
 #include <dune/common/fvector.hh>
 
+#include <dumux/common/deprecated.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/math.hh>

dumux/flux/staggered/freeflow/maxwellstefanslaw.hh

@@ -24,8 +24,9 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_MAXWELL_STEFAN_LAW_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_MAXWELL_STEFAN_LAW_HH
 
-#include <dune/common/float_cmp.hh>
-#include <dumux/common/math.hh>
+#include <dune/common/fmatrix.hh>
+
+#include <dumux/common/deprecated.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/discretization/method.hh>