[discretziation][doc] Use discMethod for all DiscretizationMethod template argument names

dumux/discretization/box/fourierslawnonequilibrium.hh

@@ -34,7 +34,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod DM>
+template <class TypeTag, DiscretizationMethod discMethod>
 class FouriersLawNonEquilibriumImplementation;
 
 /*!

dumux/discretization/box/maxwellstefanslaw.hh

@@ -35,7 +35,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod DM>
+template <class TypeTag, DiscretizationMethod discMethod>
 class MaxwellStefansLawImplementation;
 
 /*!

dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh

@@ -50,7 +50,7 @@ namespace Dumux
  *        The interfaces of the lambdas are chosen such that all involved tensors can be extracted
  *        with the given arguments.
  */
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class TensorLambdaFactory
 {
 public:

dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh

@@ -35,7 +35,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod DM>
+template <class TypeTag, DiscretizationMethod discMethod>
 class MaxwellStefansLawImplementation;
 
 /*!

dumux/discretization/darcyslaw.hh

@@ -33,7 +33,7 @@
 namespace Dumux
 {
 // forward declaration
-template <class TypeTag, DiscretizationMethod Method>
+template <class TypeTag, DiscretizationMethod discMethod>
 class DarcysLawImplementation
 {};
 

dumux/discretization/fickslaw.hh

@@ -32,7 +32,7 @@
 namespace Dumux
 {
 // forward declaration
-template <class TypeTag, DiscretizationMethod Method>
+template <class TypeTag, DiscretizationMethod discMethod>
 class FicksLawImplementation;
 
 /*!

dumux/discretization/fluxstencil.hh

@@ -41,7 +41,7 @@ namespace Dumux
  *       since we use the flux stencil for matrix and assembly. This might lead to some zeros stored
  *       in the matrix.
  */
-template<class FVElementGeometry, DiscretizationMethod Method = FVElementGeometry::FVGridGeometry::discretizationMethod>
+template<class FVElementGeometry, DiscretizationMethod discMethod = FVElementGeometry::FVGridGeometry::discretizationMethod>
 class FluxStencil;
 
 /*

dumux/discretization/fourierslaw.hh

@@ -32,7 +32,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod Method>
+template <class TypeTag, DiscretizationMethod discMethod>
 class FouriersLawImplementation
 {};
 

dumux/discretization/fourierslawnonequilibrium.hh

@@ -30,7 +30,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod Method>
+template <class TypeTag, DiscretizationMethod discMethod>
 class FouriersLawNonEquilibriumImplementation
 {};
 

dumux/discretization/maxwellstefanslaw.hh

@@ -30,7 +30,7 @@
 namespace Dumux
 {
 // forward declaration
-template <class TypeTag, DiscretizationMethod Method>
+template <class TypeTag, DiscretizationMethod discMethod>
 class MaxwellStefansLawImplementation
 {};
 

dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh

@@ -35,7 +35,7 @@
 namespace Dumux {
 
 // forward declaration
-template <class TypeTag, DiscretizationMethod DM>
+template <class TypeTag, DiscretizationMethod discMethod>
 class MaxwellStefansLawImplementation;
 
 /*!

dumux/discretization/upwindscheme.hh

@@ -32,7 +32,7 @@ namespace Dumux
 {
 
 //! Forward declaration of the upwind scheme implementation
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class UpwindSchemeImplementation;
 
 /*!

dumux/freeflow/navierstokes/fluxvariables.hh

@@ -32,7 +32,7 @@ namespace Dumux
 {
 
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class NavierStokesFluxVariablesImpl;
 
 /*!

dumux/freeflow/navierstokes/fluxvariablescache.hh

@@ -30,7 +30,7 @@
 namespace Dumux
 {
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class FreeFlowFluxVariablesCacheImplementation
 {};
 

dumux/freeflow/navierstokes/localresidual.hh

@@ -32,7 +32,7 @@ namespace Dumux
 {
 
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class NavierStokesResidualImpl;
 
 /*!

dumux/freeflow/navierstokes/problem.hh

@@ -34,7 +34,7 @@ namespace Dumux
 
 
 //! The implementation is specialized for the different discretizations
-template<class TypeTag, DiscretizationMethod DM> struct NavierStokesParentProblemImpl;
+template<class TypeTag, DiscretizationMethod discMethod> struct NavierStokesParentProblemImpl;
 
 template<class TypeTag>
 struct NavierStokesParentProblemImpl<TypeTag, DiscretizationMethod::staggered>

dumux/freeflow/navierstokes/staggered/fluxvariables.hh

@@ -32,7 +32,7 @@ namespace Dumux
 {
 
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class NavierStokesFluxVariablesImpl;
 
 

dumux/freeflow/navierstokes/staggered/localresidual.hh

@@ -33,7 +33,7 @@ namespace Dumux
 {
 
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class NavierStokesResidualImpl;
 
 /*!

dumux/freeflow/navierstokes/vtkoutputfields.hh

@@ -50,8 +50,8 @@ class NavierStokesVtkOutputFields
     using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
 
     // Helper type used for tag dispatching (to add discretization-specific fields).
-    template<DiscretizationMethod method>
-    using MethodType = std::integral_constant<DiscretizationMethod, method>;
+    template<DiscretizationMethod discMethod>
+    using discMethodTag = std::integral_constant<DiscretizationMethod, discMethod>;
 
 public:
     //! Initialize the Navier-Stokes specific vtk output fields.
@@ -61,8 +61,7 @@ public:
         vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(); }, "p");
 
         // add discretization-specific fields
-        const auto discType = MethodType<GET_PROP_VALUE(TypeTag, DiscretizationMethod)>();
-        additionalOutput_(vtk, discType);
+        additionalOutput_(vtk, discMethodTag<GET_PROP_VALUE(TypeTag, DiscretizationMethod)>{});
     }
 
 private:
@@ -74,7 +73,7 @@ private:
 
     //! Adds discretization-specific fields (velocity vectors on the faces for the staggered discretization).
     template <class VtkOutputModule>
-    static void additionalOutput_(VtkOutputModule& vtk, MethodType<DiscretizationMethod::staggered>)
+    static void additionalOutput_(VtkOutputModule& vtk, discMethodTag<DiscretizationMethod::staggered>)
     {
         const bool writeFaceVars = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.WriteFaceData", false);
         if(writeFaceVars)

dumux/freeflow/navierstokesnc/fluxvariables.hh

@@ -32,7 +32,7 @@ namespace Dumux
 
 
 // forward declaration
-template<class TypeTag, DiscretizationMethod Method>
+template<class TypeTag, DiscretizationMethod discMethod>
 class NavierStokesNCFluxVariablesImpl;
 
 /*!