diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index 274f37720b1ef86f956a9a353b4f817bb25cb2f8..710f9e8a192079a41e39b11581901b016419c103 100644
--- a/dumux/assembly/jacobianpattern.hh
+++ b/dumux/assembly/jacobianpattern.hh
@@ -35,7 +35,7 @@ namespace Dumux {
* \brief Helper function to generate Jacobian pattern for the box method
*/
template<bool isImplicit, class GridGeometry,
- typename std::enable_if_t<(GridGeometry::discretizationMethod == DiscretizationMethod::box), int> = 0>
+ typename std::enable_if_t<(GridGeometry::discMethod == DiscretizationMethod::box), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{
const auto numDofs = gridGeometry.numDofs();
@@ -76,8 +76,8 @@ Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
* \brief Helper function to generate Jacobian pattern for cell-centered methods
*/
template<bool isImplicit, class GridGeometry,
- typename std::enable_if_t<( (GridGeometry::discretizationMethod == DiscretizationMethod::cctpfa)
- || (GridGeometry::discretizationMethod == DiscretizationMethod::ccmpfa) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethod::cctpfa)
+ || (GridGeometry::discMethod == DiscretizationMethod::ccmpfa) ), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{
const auto numDofs = gridGeometry.numDofs();
diff --git a/dumux/assembly/partialreassembler.hh b/dumux/assembly/partialreassembler.hh
index eefee19018120090cc6f5c3d808410c11595d5c5..6eff09375e9741ed7021de353dd13d051faf98b7 100644
--- a/dumux/assembly/partialreassembler.hh
+++ b/dumux/assembly/partialreassembler.hh
@@ -393,7 +393,7 @@ class PartialReassembler
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
- static constexpr DiscretizationMethod discMethod = FVGridGeometry::discretizationMethod;
+ static constexpr DiscretizationMethod discMethod = FVGridGeometry::discMethod;
using Engine = PartialReassemblerEngine<Assembler, discMethod>;
static constexpr auto hasVertexColor = Dumux::isValid([](auto&& a) -> decltype(a.vertexColor(0)) {});
diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh
index 9c1492e9c3d58b8f605170845907f2b9d95681b6..06429cb2db05b58981c15058850340b89f136faa 100644
--- a/dumux/discretization/box/fvgridgeometry.hh
+++ b/dumux/discretization/box/fvgridgeometry.hh
@@ -95,7 +95,7 @@ class BoxFVGridGeometry<Scalar, GV, true, Traits>
public:
//! export discretization method
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::box;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::box;
//! export the type of the fv element geometry (the local view type)
using LocalView = typename Traits::template LocalView<ThisType, true>;
@@ -303,7 +303,7 @@ class BoxFVGridGeometry<Scalar, GV, false, Traits>
public:
//! export discretization method
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::box;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::box;
//! export the type of the fv element geometry (the local view type)
using LocalView = typename Traits::template LocalView<ThisType, false>;
diff --git a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
index b675ba02a46faad2f224913a8411a3808a0df489..cf8210842946b399a7691dbdd30d7a48e897dad4 100644
--- a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
@@ -264,7 +264,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::ccmpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::ccmpfa;
// export the type for the corresponding cache
using Cache = MpfaDarcysLawCache;
diff --git a/dumux/discretization/cellcentered/mpfa/fickslaw.hh b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
index 155e1a62449719374a693cf5fc364bbc8a94b588..9737cbf684003cd2a5e55ee1b7e3735a2419ba55 100644
--- a/dumux/discretization/cellcentered/mpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
@@ -220,7 +220,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::ccmpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::ccmpfa;
// state the type for the corresponding cache and its filler
using Cache = MpfaFicksLawCache;
diff --git a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
index e8a53f899ecea2c26c8ddf7ba75c4fe90faaa212..1f38bf7fada9c43a140daa5c7f9be023abf88330 100644
--- a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
+++ b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
@@ -427,7 +427,7 @@ private:
template< class InteractionVolume,
class DataHandle,
class AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType),
- typename std::enable_if_t<AdvectionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<AdvectionType::discMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillAdvectionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll)
{
using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>;
@@ -509,7 +509,7 @@ private:
template< class InteractionVolume,
class DataHandle,
class DiffusionType = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType),
- typename std::enable_if_t<DiffusionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<DiffusionType::discMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillDiffusionHandle(InteractionVolume& iv,
DataHandle& handle,
bool forceUpdateAll,
@@ -551,7 +551,7 @@ private:
template< class InteractionVolume,
class DataHandle,
class HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType),
- typename std::enable_if_t<HeatConductionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<HeatConductionType::discMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillHeatConductionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll)
{
using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>;
@@ -584,21 +584,21 @@ private:
template< class InteractionVolume,
class DataHandle,
class AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType),
- typename std::enable_if_t<AdvectionType::myDiscretizationMethod != DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<AdvectionType::discMethod != DiscretizationMethod::ccmpfa, int> = 0 >
void fillAdvectionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll) {}
//! fill handle only when diffusion uses mpfa
template< class InteractionVolume,
class DataHandle,
class DiffusionType = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType),
- typename std::enable_if_t<DiffusionType::myDiscretizationMethod != DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<DiffusionType::discMethod != DiscretizationMethod::ccmpfa, int> = 0 >
void fillDiffusionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll, int phaseIdx, int compIdx) {}
//! fill handle only when heat conduction uses mpfa
template< class InteractionVolume,
class DataHandle,
class HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType),
- typename std::enable_if_t<HeatConductionType::myDiscretizationMethod != DiscretizationMethod::ccmpfa, int> = 0 >
+ typename std::enable_if_t<HeatConductionType::discMethod != DiscretizationMethod::ccmpfa, int> = 0 >
void fillHeatConductionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll) {}
const Problem* problemPtr_;
diff --git a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
index f0dfe49933075cd858713e53da8b8bc3898615a3..5adfe2f6b4eaa592cc1f48cc2f8d84eee99a878a 100644
--- a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
@@ -210,7 +210,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::ccmpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::ccmpfa;
// state the type for the corresponding cache and its filler
using Cache = MpfaFouriersLawCache;
diff --git a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
index a68e9678a706275a7f95bdfe9814954ecce79f5e..d4290f0068cf4b5f33d7d99a22c436437896e0c1 100644
--- a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
@@ -97,7 +97,7 @@ public:
using GridView = GV;
//! export the discretization method this geometry belongs to
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::ccmpfa;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::ccmpfa;
//! The maximum admissible stencil size (used for static memory allocation during assembly)
static constexpr int maxElementStencilSize = Traits::maxElementStencilSize;
@@ -446,7 +446,7 @@ public:
using GridView = GV;
//! export the discretization method this geometry belongs to
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::ccmpfa;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::ccmpfa;
//! The maximum admissible stencil size (used for static memory allocation during assembly)
static constexpr int maxElementStencilSize = Traits::maxElementStencilSize;
diff --git a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
index 4148f86472a56e0364412e1a4b0189420b7b0c6e..71b85b6743b5bfe80a972547a937ec19401e458a 100644
--- a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
@@ -143,7 +143,7 @@ class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ false>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! state the type for the corresponding cache
using Cache = TpfaDarcysLawCache<TypeTag>;
@@ -299,7 +299,7 @@ class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ true>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! state the type for the corresponding cache
using Cache = TpfaDarcysLawCache<TypeTag>;
diff --git a/dumux/discretization/cellcentered/tpfa/fickslaw.hh b/dumux/discretization/cellcentered/tpfa/fickslaw.hh
index 20ae68beff1502028b18a3061dad665b7741ee8a..43f990f738d1073744137fb245b2059e39e07c4a 100644
--- a/dumux/discretization/cellcentered/tpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fickslaw.hh
@@ -115,7 +115,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::cctpfa>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! state the type for the corresponding cache and its filler
using Cache = TpfaFicksLawCache;
diff --git a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh b/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
index 655ef1c103581557041f0af37462f8fd5a7980fc..bd76d9c86bcfa5acd37872e12fa54be91a017444 100644
--- a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
@@ -107,7 +107,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::cctpfa>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! export the type for the corresponding cache
using Cache = TpfaFouriersLawCache;
diff --git a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
index 34437270c1ed3a1d50823f943589eb9546af3b29..e79492e133eca71a29dec376c6914dbd418f303e 100644
--- a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
@@ -107,7 +107,7 @@ public:
using DofMapper = typename Traits::ElementMapper;
//! export the discretization method this geometry belongs to
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::cctpfa;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! The maximum admissible stencil size (used for static memory allocation during assembly)
static constexpr int maxElementStencilSize = LocalView::maxNumElementScvfs*Traits::maxNumScvfNeighbors + 1;
@@ -383,7 +383,7 @@ public:
using DofMapper = typename Traits::ElementMapper;
//! Export the discretization method this geometry belongs to
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::cctpfa;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! The maximum admissible stencil size (used for static memory allocation during assembly)
static constexpr int maxElementStencilSize = LocalView::maxNumElementScvfs*Traits::maxNumScvfNeighbors + 1;
diff --git a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
index e36bc0ca1715373d5ed9dcc994eabb81d07f11fb..273762133a6a953be0453a537d5c761486c555be 100644
--- a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
@@ -74,7 +74,7 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::cctpfa >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa;
//! state the type for the corresponding cache and its filler
//! We don't cache anything for this law
diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh
index fe1aebf0bc3b330c2865ea6f1835156f16627e12..856718d14fd13764be97f609f1c586bd93519e67 100644
--- a/dumux/discretization/fluxstencil.hh
+++ b/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 discMethod = FVElementGeometry::FVGridGeometry::discretizationMethod>
+template<class FVElementGeometry, DiscretizationMethod discMethod = FVElementGeometry::FVGridGeometry::discMethod>
class FluxStencil;
/*
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index 6d0c3883e9a08bed90b346fe948ba78985e1aa81..00ec334a547293adaca9c294233df5d58ee8c42d 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -75,7 +75,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethod::staggered >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::staggered;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::staggered;
//! state the type for the corresponding cache
//! We don't cache anything for this law
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 4456afce9cbaf7e510f48e8545ecd3647b79b95e..9084530c9c93f164ced153c7342835d5b3612ac6 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -57,7 +57,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::staggered;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::staggered;
//! state the type for the corresponding cache
//! We don't cache anything for this law
diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
index d0104572490a25fe828e68b9363229c6c31b77df..265e701c5397e19c763df0c951d100c845ba1d10 100644
--- a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
+++ b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
@@ -77,7 +77,7 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::staggered >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::staggered;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::staggered;
//! state the type for the corresponding cache and its filler
//! We don't cache anything for this law
diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index 99d029a35a9fe92222efbe066445cec63b5b7405..1edb5f41f6a6c6bb0b0255a47af43f6251ea4489 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -67,7 +67,7 @@ class StaggeredFVGridGeometry<GV, true, Traits>
public:
//! export discretization method
- static constexpr DiscretizationMethod discretizationMethod = DiscretizationMethod::staggered;
+ static constexpr DiscretizationMethod discMethod = DiscretizationMethod::staggered;
//! export the type of the fv element geometry (the local view type)
using LocalView = typename Traits::template LocalView<ThisType, true>;
diff --git a/dumux/discretization/stationaryvelocityfield.hh b/dumux/discretization/stationaryvelocityfield.hh
index a5d19e170dfd5a817b5d7bd8f85c8c4f23574d14..8bfe49e5876ed0830c95324da55d05e33a766691 100644
--- a/dumux/discretization/stationaryvelocityfield.hh
+++ b/dumux/discretization/stationaryvelocityfield.hh
@@ -51,7 +51,7 @@ class StationaryVelocityField
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::none;
+ static const DiscretizationMethod discMethod = DiscretizationMethod::none;
//! state the type for the corresponding cache
using Cache = FluxVariablesCaching::EmptyAdvectionCache<TypeTag>;
diff --git a/dumux/nonlinear/privarswitchnewtonsolver.hh b/dumux/nonlinear/privarswitchnewtonsolver.hh
index ce599c9b165c94d72d30ce88a8e22bd591336d62..3893503a215b4d7da840175e55bc3707af24882f 100644
--- a/dumux/nonlinear/privarswitchnewtonsolver.hh
+++ b/dumux/nonlinear/privarswitchnewtonsolver.hh
@@ -52,8 +52,8 @@ class PriVarSwitchNewtonSolver : public NewtonSolver<Assembler, LinearSolver>
using PrimaryVariableSwitch = typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- static constexpr auto discretizationMethod = Assembler::FVGridGeometry::discretizationMethod;
- static constexpr bool isBox = discretizationMethod == DiscretizationMethod::box;
+ static constexpr auto discMethod = Assembler::FVGridGeometry::discMethod;
+ static constexpr bool isBox = discMethod == DiscretizationMethod::box;
public:
using ParentType::ParentType;