diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh
index 64e7ada14907e6d9f1100a64fb798df33a5b4da4..35a7c020d7baa8e840c05f98e8c763ce4e03bd43 100644
--- a/dumux/adaptive/initializationindicator.hh
+++ b/dumux/adaptive/initializationindicator.hh
@@ -51,7 +51,7 @@ class GridAdaptInitializationIndicator
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index efb670db12bdeabfbb04e087651527ed34495757..ca6b818af64a03653eedd44aa0d6be3c6c45b7eb 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -58,8 +58,8 @@ class FVAssembler
using TimeLoop = TimeLoopBase<typename GET_PROP_TYPE(TypeTag, Scalar)>;
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- static constexpr DiscretizationMethods discMethod = GET_PROP_VALUE(TypeTag, DiscretizationMethod);
- static constexpr bool isBox = discMethod == DiscretizationMethods::Box;
+ static constexpr DiscretizationMethod discMethod = GET_PROP_VALUE(TypeTag, DiscretizationMethod);
+ static constexpr bool isBox = discMethod == DiscretizationMethod::box;
using ThisType = FVAssembler<TypeTag, diffMethod, isImplicit>;
using LocalAssembler = std::conditional_t<isBox, BoxLocalAssembler<TypeTag, ThisType, diffMethod, isImplicit>,
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 3a4e4c747df2d80688885480281763f1c8fc9372..264a1a7e8e91924489152bbc41300b16d5750846 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -495,7 +495,7 @@ public:
//! Compute the derivative of the flux residual
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethod::box, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -509,7 +509,7 @@ public:
//! Compute the derivative of the flux residual for the box method
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index 1847c116213aafef95713ded2028032301323ec7..274f37720b1ef86f956a9a353b4f817bb25cb2f8 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 == DiscretizationMethods::Box), int> = 0>
+ typename std::enable_if_t<(GridGeometry::discretizationMethod == 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 == DiscretizationMethods::CCTpfa)
- || (GridGeometry::discretizationMethod == DiscretizationMethods::CCMpfa) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometry::discretizationMethod == DiscretizationMethod::cctpfa)
+ || (GridGeometry::discretizationMethod == 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 0daad5cb67e5b75bbcbf14f5fd0e4233e3dccbec..eefee19018120090cc6f5c3d808410c11595d5c5 100644
--- a/dumux/assembly/partialreassembler.hh
+++ b/dumux/assembly/partialreassembler.hh
@@ -54,7 +54,7 @@ public:
};
//! the partial reassembler engine specialized for discretization methods
-template<class Assembler, DiscretizationMethods discMethod>
+template<class Assembler, DiscretizationMethod discMethod>
class PartialReassemblerEngine
{
public:
@@ -79,7 +79,7 @@ public:
//! the partial reassembler engine specialized for the box method
template<class Assembler>
-class PartialReassemblerEngine<Assembler, DiscretizationMethods::Box>
+class PartialReassemblerEngine<Assembler, DiscretizationMethod::box>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::FVGridGeometry;
@@ -280,7 +280,7 @@ private:
//! the partial reassembler engine specialized for the box method
template<class Assembler>
-class PartialReassemblerEngine<Assembler, DiscretizationMethods::CCTpfa>
+class PartialReassemblerEngine<Assembler, DiscretizationMethod::cctpfa>
{
using Scalar = typename Assembler::Scalar;
using FVGridGeometry = typename Assembler::FVGridGeometry;
@@ -372,10 +372,10 @@ private:
//! the partial reassembler engine specialized for the mpfa method
template<class Assembler>
-class PartialReassemblerEngine<Assembler, DiscretizationMethods::CCMpfa>
-: public PartialReassemblerEngine<Assembler, DiscretizationMethods::CCTpfa>
+class PartialReassemblerEngine<Assembler, DiscretizationMethod::ccmpfa>
+: public PartialReassemblerEngine<Assembler, DiscretizationMethod::cctpfa>
{
- using ParentType = PartialReassemblerEngine<Assembler, DiscretizationMethods::CCTpfa>;
+ using ParentType = PartialReassemblerEngine<Assembler, DiscretizationMethod::cctpfa>;
public:
using ParentType::ParentType;
};
@@ -393,7 +393,7 @@ class PartialReassembler
using JacobianMatrix = typename Assembler::JacobianMatrix;
using VertexMapper = typename FVGridGeometry::VertexMapper;
- static constexpr DiscretizationMethods discMethod = FVGridGeometry::discretizationMethod;
+ static constexpr DiscretizationMethod discMethod = FVGridGeometry::discretizationMethod;
using Engine = PartialReassemblerEngine<Assembler, discMethod>;
static constexpr auto hasVertexColor = Dumux::isValid([](auto&& a) -> decltype(a.vertexColor(0)) {});
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index cc521b7e1b5773619323e8edec857a124ada354d..9c74eabf46d136da761cd299dc71e0129ea05786 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -75,7 +75,7 @@ class FVProblem
using CoordScalar = typename GridView::ctype;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
using PointSourceMap = std::map<std::pair<std::size_t, std::size_t>,
std::vector<PointSource> >;
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index 271228fe8e1c6a34e92ca007e659d641025e9216..a5522c57e614465c1a60c907743e0a4ff9976bcb 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -285,7 +285,7 @@ class BoundingBoxTreePointSourceHelper
static constexpr int dim = GridView::dimension;
static constexpr int dimworld = GridView::dimensionworld;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
static constexpr int dofCodim = isBox ? dim : 0;
public:
diff --git a/dumux/discretization/box/darcyslaw.hh b/dumux/discretization/box/darcyslaw.hh
index 23438c4b38c6bc847c8daa2eb02178b41e2a0f0b..a68e30d723cf4d4e38c0de1196e4ee9611ec682b 100644
--- a/dumux/discretization/box/darcyslaw.hh
+++ b/dumux/discretization/box/darcyslaw.hh
@@ -33,7 +33,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class DarcysLawImplementation;
/*!
@@ -41,7 +41,7 @@ class DarcysLawImplementation;
* \brief Specialization of Darcy's Law for the box method.
*/
template <class TypeTag>
-class DarcysLawImplementation<TypeTag, DiscretizationMethods::Box>
+class DarcysLawImplementation<TypeTag, DiscretizationMethod::box>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
diff --git a/dumux/discretization/box/elementvolumevariables.hh b/dumux/discretization/box/elementvolumevariables.hh
index ed83830f5395c34c422a8b2828c4565f1a482dea..b27c5b0533f8fec2568a1f38c538d022c203a223 100644
--- a/dumux/discretization/box/elementvolumevariables.hh
+++ b/dumux/discretization/box/elementvolumevariables.hh
@@ -53,7 +53,7 @@ class BoxElementVolumeVariables<TypeTag,/*enableGlobalVolVarCache*/true>
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
//! Constructor
diff --git a/dumux/discretization/box/fickslaw.hh b/dumux/discretization/box/fickslaw.hh
index 46eaab2f79f91213e12eec50f6169b9418a111c5..c798c3c7aa23dd14a8a133a6577d3a7d77ff3703 100644
--- a/dumux/discretization/box/fickslaw.hh
+++ b/dumux/discretization/box/fickslaw.hh
@@ -31,7 +31,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FicksLawImplementation;
/*!
@@ -39,7 +39,7 @@ class FicksLawImplementation;
* \brief Specialization of Fick's Law for the box method.
*/
template <class TypeTag>
-class FicksLawImplementation<TypeTag, DiscretizationMethods::Box>
+class FicksLawImplementation<TypeTag, DiscretizationMethod::box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/dumux/discretization/box/fourierslaw.hh b/dumux/discretization/box/fourierslaw.hh
index 4bca34bde49edc8536a9e6f5de8ca2a0b535c7c9..685126cbec66c618a6185cc7e6ae286535ffd103 100644
--- a/dumux/discretization/box/fourierslaw.hh
+++ b/dumux/discretization/box/fourierslaw.hh
@@ -31,7 +31,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FouriersLawImplementation;
/*!
@@ -39,7 +39,7 @@ class FouriersLawImplementation;
* \brief Specialization of Fourier's Law for the box method.
*/
template <class TypeTag>
-class FouriersLawImplementation<TypeTag, DiscretizationMethods::Box>
+class FouriersLawImplementation<TypeTag, DiscretizationMethod::box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/dumux/discretization/box/fourierslawnonequilibrium.hh b/dumux/discretization/box/fourierslawnonequilibrium.hh
index 0666b8576d1f08de6385b54b5277be1d2791b932..ba180e9f7fb5861ab32bfa4fef3d7e0993193a96 100644
--- a/dumux/discretization/box/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/box/fourierslawnonequilibrium.hh
@@ -34,7 +34,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods DM>
+template <class TypeTag, DiscretizationMethod DM>
class FouriersLawNonEquilibriumImplementation;
/*!
@@ -42,7 +42,7 @@ class FouriersLawNonEquilibriumImplementation;
* \brief Specialization of Fourier's Law for the box method for thermal nonequilibrium models.
*/
template <class TypeTag>
-class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethods::Box>
+class FouriersLawNonEquilibriumImplementation<TypeTag, DiscretizationMethod::box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh
index 58f3194d990a90a89a62f5a1c9d470a569158217..9c1492e9c3d58b8f605170845907f2b9d95681b6 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::Box;
+ static constexpr DiscretizationMethod discretizationMethod = 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::Box;
+ static constexpr DiscretizationMethod discretizationMethod = 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/box/maxwellstefanslaw.hh b/dumux/discretization/box/maxwellstefanslaw.hh
index a274a157140216722b2a449ab67adf3f504d0cb7..e52665e9a6703ce5a27a00aea486f34c9ed8f817 100644
--- a/dumux/discretization/box/maxwellstefanslaw.hh
+++ b/dumux/discretization/box/maxwellstefanslaw.hh
@@ -35,7 +35,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods DM>
+template <class TypeTag, DiscretizationMethod DM>
class MaxwellStefansLawImplementation;
/*!
@@ -43,7 +43,7 @@ class MaxwellStefansLawImplementation;
* \brief Specialization of Maxwell Stefan's Law for the Box method.
*/
template <class TypeTag>
-class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethods::Box >
+class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::box >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
diff --git a/dumux/discretization/box/properties.hh b/dumux/discretization/box/properties.hh
index 5eabbb7f212fb727dc500cf7d39563c4aa0c8eb9..0057084b1fd11ed43d52518efb290d367fbfa118 100644
--- a/dumux/discretization/box/properties.hh
+++ b/dumux/discretization/box/properties.hh
@@ -56,7 +56,7 @@ NEW_TYPE_TAG(BoxModel, INHERITS_FROM(FiniteVolumeModel));
//! Set the corresponding discretization method property
SET_PROP(BoxModel, DiscretizationMethod)
{
- static const DiscretizationMethods value = DiscretizationMethods::Box;
+ static const DiscretizationMethod value = DiscretizationMethod::box;
};
//! Set the default for the global finite volume geometry
diff --git a/dumux/discretization/box/scvftoscvboundarytypes.hh b/dumux/discretization/box/scvftoscvboundarytypes.hh
index 1c26181768819e4efaf2bdbceeb84d9f82d99369..bfd9d43b0c9cdf78b761f98b2c543290c236abd6 100644
--- a/dumux/discretization/box/scvftoscvboundarytypes.hh
+++ b/dumux/discretization/box/scvftoscvboundarytypes.hh
@@ -34,7 +34,7 @@ namespace Dumux
* \ingroup BoxModel
* \brief Convert intersection boundary types to vertex boundary types
*/
-template<class BoundaryTypes, DiscretizationMethods discMethod>
+template<class BoundaryTypes, DiscretizationMethod discMethod>
class ScvfToScvBoundaryTypes
{
public:
@@ -44,7 +44,7 @@ public:
void computeBoundaryTypes(const Problem& problem)
{
// only do something for box
- if (discMethod == DiscretizationMethods::Box)
+ if (discMethod == DiscretizationMethod::box)
{
const auto& fvGridGeometry = problem.fvGridGeometry();
scvBoundaryTypes.resize(fvGridGeometry.vertexMapper().size());
@@ -81,7 +81,7 @@ public:
template<class SubControlVolume>
const BoundaryTypes& boundaryTypes(const SubControlVolume& scv) const
{
- if (discMethod == DiscretizationMethods::Box)
+ if (discMethod == DiscretizationMethod::box)
return scvBoundaryTypes[scv.dofIndex()];
else
DUNE_THROW(Dune::InvalidStateException, "Only use this for the box discretization!");
diff --git a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
index 86e2e5502fbe5f558d3c765216e2c3ed6f28b015..b675ba02a46faad2f224913a8411a3808a0df489 100644
--- a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
@@ -35,7 +35,7 @@
namespace Dumux
{
//! forward declaration of the method-specific implementation
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class DarcysLawImplementation;
/*!
@@ -43,7 +43,7 @@ class DarcysLawImplementation;
* \brief Darcy's law for cell-centered finite volume schemes with multi-point flux approximation.
*/
template<class TypeTag>
-class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
+class DarcysLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -264,7 +264,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCMpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 de03c053c1c5fa5bd584bc56afe2e7c71a5f74ce..155e1a62449719374a693cf5fc364bbc8a94b588 100644
--- a/dumux/discretization/cellcentered/mpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
@@ -31,7 +31,7 @@
namespace Dumux
{
//! forward declaration of the method-specific implemetation
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FicksLawImplementation;
/*!
@@ -39,7 +39,7 @@ class FicksLawImplementation;
* \brief Fick's law for cell-centered finite volume schemes with multi-point flux approximation
*/
template <class TypeTag>
-class FicksLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
+class FicksLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -220,7 +220,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCMpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 b2196d97c716c9657d12b30f28060eafc4d5ec85..e8a53f899ecea2c26c8ddf7ba75c4fe90faaa212 100644
--- a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
+++ b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
@@ -427,10 +427,10 @@ private:
template< class InteractionVolume,
class DataHandle,
class AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType),
- typename std::enable_if_t<AdvectionType::myDiscretizationMethod == DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<AdvectionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillAdvectionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll)
{
- using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethods::CCMpfa>;
+ using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>;
// get instance of the interaction volume-local assembler
static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
@@ -509,13 +509,13 @@ private:
template< class InteractionVolume,
class DataHandle,
class DiffusionType = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType),
- typename std::enable_if_t<DiffusionType::myDiscretizationMethod == DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<DiffusionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillDiffusionHandle(InteractionVolume& iv,
DataHandle& handle,
bool forceUpdateAll,
int phaseIdx, int compIdx)
{
- using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethods::CCMpfa>;
+ using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>;
// get instance of the interaction volume-local assembler
static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
@@ -551,10 +551,10 @@ private:
template< class InteractionVolume,
class DataHandle,
class HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType),
- typename std::enable_if_t<HeatConductionType::myDiscretizationMethod == DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<HeatConductionType::myDiscretizationMethod == DiscretizationMethod::ccmpfa, int> = 0 >
void fillHeatConductionHandle(InteractionVolume& iv, DataHandle& handle, bool forceUpdateAll)
{
- using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethods::CCMpfa>;
+ using LambdaFactory = TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>;
// get instance of the interaction volume-local assembler
static constexpr MpfaMethods M = InteractionVolume::MpfaMethod;
@@ -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 != DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<AdvectionType::myDiscretizationMethod != 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 != DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<DiffusionType::myDiscretizationMethod != 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 != DiscretizationMethods::CCMpfa, int> = 0 >
+ typename std::enable_if_t<HeatConductionType::myDiscretizationMethod != 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 aa153053a6447c327663794f6f982a052b5fdf90..f0dfe49933075cd858713e53da8b8bc3898615a3 100644
--- a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
@@ -35,7 +35,7 @@
namespace Dumux
{
//! forward declaration of the method-specific implementation
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FouriersLawImplementation;
/*!
@@ -43,7 +43,7 @@ class FouriersLawImplementation;
* \brief Fourier's law for cell-centered finite volume schemes with two-point flux approximation
*/
template <class TypeTag>
-class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
+class FouriersLawImplementation<TypeTag, DiscretizationMethod::ccmpfa>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -210,7 +210,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCMpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 d429170b2cc9f2280b1b40e7cd06e3edfc951bc3..a68e9678a706275a7f95bdfe9814954ecce79f5e 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::CCMpfa;
+ static constexpr DiscretizationMethod discretizationMethod = 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::CCMpfa;
+ static constexpr DiscretizationMethod discretizationMethod = 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/mpfa/properties.hh b/dumux/discretization/cellcentered/mpfa/properties.hh
index db0cbcae3330bafb573c5b88df4d0d68a5281716..c828d2f8320ca264f73b3ea3ed8c0eb7b7081b74 100644
--- a/dumux/discretization/cellcentered/mpfa/properties.hh
+++ b/dumux/discretization/cellcentered/mpfa/properties.hh
@@ -63,7 +63,7 @@ NEW_TYPE_TAG(CCMpfaModel, INHERITS_FROM(FiniteVolumeModel));
//! Set the corresponding discretization method property
SET_PROP(CCMpfaModel, DiscretizationMethod)
{
- static const DiscretizationMethods value = DiscretizationMethods::CCMpfa;
+ static const DiscretizationMethod value = DiscretizationMethod::ccmpfa;
};
//! Set the index set type used on the dual grid nodes
diff --git a/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh b/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh
index ddbef9b1e5ce5c0478d9da78a6fe98fa3a00f9e9..4330d1bf452a190ab057a1b8b421f68257628122 100644
--- a/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh
+++ b/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, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class TensorLambdaFactory
{
public:
@@ -97,7 +97,7 @@ public:
//! Specialization for mpfa schemes
template<class TypeTag>
-class TensorLambdaFactory<TypeTag, DiscretizationMethods::CCMpfa>
+class TensorLambdaFactory<TypeTag, DiscretizationMethod::ccmpfa>
{
public:
diff --git a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
index 2a408e32ac9b8fe5e38ea579b33c1a02bc8430d5..4148f86472a56e0364412e1a4b0189420b7b0c6e 100644
--- a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
@@ -34,7 +34,7 @@
namespace Dumux
{
// forward declarations
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class DarcysLawImplementation;
template<class TypeTag, bool isNetwork>
@@ -46,7 +46,7 @@ class CCTpfaDarcysLaw;
* \note Darcy's law is speialized for network and surface grids (i.e. if grid dim < dimWorld)
*/
template <class TypeTag>
-class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
+class DarcysLawImplementation<TypeTag, DiscretizationMethod::cctpfa>
: public CCTpfaDarcysLaw<TypeTag, (GET_PROP_TYPE(TypeTag, Grid)::dimension < GET_PROP_TYPE(TypeTag, Grid)::dimensionworld) >
{};
@@ -121,7 +121,7 @@ private:
template<class TypeTag>
class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ false>
{
- using Implementation = DarcysLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>;
+ using Implementation = DarcysLawImplementation<TypeTag, DiscretizationMethod::cctpfa>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -143,7 +143,7 @@ class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ false>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::cctpfa;
//! state the type for the corresponding cache
using Cache = TpfaDarcysLawCache<TypeTag>;
@@ -277,7 +277,7 @@ class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ false>
template<class TypeTag>
class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ true>
{
- using Implementation = DarcysLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>;
+ using Implementation = DarcysLawImplementation<TypeTag, DiscretizationMethod::cctpfa>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -299,7 +299,7 @@ class CCTpfaDarcysLaw<TypeTag, /*isNetwork*/ true>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 4004d642c3dc1f552e93e13a15a8bb6fe65d53ed..20ae68beff1502028b18a3061dad665b7741ee8a 100644
--- a/dumux/discretization/cellcentered/tpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fickslaw.hh
@@ -33,7 +33,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FicksLawImplementation;
/*!
@@ -41,9 +41,9 @@ class FicksLawImplementation;
* \brief Fick's law for cell-centered finite volume schemes with two-point flux approximation
*/
template <class TypeTag>
-class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
+class FicksLawImplementation<TypeTag, DiscretizationMethod::cctpfa>
{
- using Implementation = FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>;
+ using Implementation = FicksLawImplementation<TypeTag, DiscretizationMethod::cctpfa>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
@@ -115,7 +115,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 acc077fb20c01d22c989329258e4734ca65a5249..655ef1c103581557041f0af37462f8fd5a7980fc 100644
--- a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
@@ -33,7 +33,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FouriersLawImplementation;
/*!
@@ -41,9 +41,9 @@ class FouriersLawImplementation;
* \brief Fourier's law for cell-centered finite volume schemes with two-point flux approximation
*/
template <class TypeTag>
-class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
+class FouriersLawImplementation<TypeTag, DiscretizationMethod::cctpfa>
{
- using Implementation = FouriersLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>;
+ using Implementation = FouriersLawImplementation<TypeTag, DiscretizationMethod::cctpfa>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
@@ -107,7 +107,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
public:
//! state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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 a29c82d1db91777421cf8e7d868d5d5e9f393037..34437270c1ed3a1d50823f943589eb9546af3b29 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::CCTpfa;
+ static constexpr DiscretizationMethod discretizationMethod = 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::CCTpfa;
+ static constexpr DiscretizationMethod discretizationMethod = 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 783f54f9b2e741f71db92bce9a1a32c730a25cdd..a47d34d05d9fa44dd2538c6e3658ceb7cac4c58d 100644
--- a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
@@ -35,7 +35,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods DM>
+template <class TypeTag, DiscretizationMethod DM>
class MaxwellStefansLawImplementation;
/*!
@@ -43,7 +43,7 @@ class MaxwellStefansLawImplementation;
* \brief Specialization of Maxwell Stefan's Law for the CCTpfa method.
*/
template <class TypeTag>
-class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
+class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::cctpfa >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -74,7 +74,7 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod myDiscretizationMethod = 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/cellcentered/tpfa/properties.hh b/dumux/discretization/cellcentered/tpfa/properties.hh
index de7eba1b339ea3aa2ef3b3c0f403b102ef826329..1e816c77d0a25e1f1620a8eeb975a06626bcd3f8 100644
--- a/dumux/discretization/cellcentered/tpfa/properties.hh
+++ b/dumux/discretization/cellcentered/tpfa/properties.hh
@@ -56,7 +56,7 @@ NEW_TYPE_TAG(CCTpfaModel, INHERITS_FROM(FiniteVolumeModel));
//! Set the corresponding discretization method property
SET_PROP(CCTpfaModel, DiscretizationMethod)
{
- static const DiscretizationMethods value = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod value = DiscretizationMethod::cctpfa;
};
//! Set the default for the global finite volume geometry
diff --git a/dumux/discretization/darcyslaw.hh b/dumux/discretization/darcyslaw.hh
index 3e24adde8d6166f71a3de1d6225bdfc8a339d5ad..9001fdca353ad225a78d4876fe304b69faddcbfc 100644
--- a/dumux/discretization/darcyslaw.hh
+++ b/dumux/discretization/darcyslaw.hh
@@ -33,7 +33,7 @@
namespace Dumux
{
// forward declaration
-template <class TypeTag, DiscretizationMethods Method>
+template <class TypeTag, DiscretizationMethod Method>
class DarcysLawImplementation
{};
diff --git a/dumux/discretization/fickslaw.hh b/dumux/discretization/fickslaw.hh
index bb880162b2cec7f8a6f31b8c8d966fb040b8e74a..c981e9f5035a786995126d097685f4aa6b694507 100644
--- a/dumux/discretization/fickslaw.hh
+++ b/dumux/discretization/fickslaw.hh
@@ -32,7 +32,7 @@
namespace Dumux
{
// forward declaration
-template <class TypeTag, DiscretizationMethods Method>
+template <class TypeTag, DiscretizationMethod Method>
class FicksLawImplementation;
/*!
diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh
index e19f6b77f91e6c1b49a812e7bf911b0be9e80c62..e2a2f3949eca5d3d6c7cc4dff6957fd7cccad9b4 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, DiscretizationMethods Method = FVElementGeometry::FVGridGeometry::discretizationMethod>
+template<class FVElementGeometry, DiscretizationMethod Method = FVElementGeometry::FVGridGeometry::discretizationMethod>
class FluxStencil;
/*
@@ -50,7 +50,7 @@ class FluxStencil;
* \tparam FVElementGeometry The local view on the finite volume grid geometry
*/
template<class FVElementGeometry>
-class FluxStencil<FVElementGeometry, DiscretizationMethods::CCTpfa>
+class FluxStencil<FVElementGeometry, DiscretizationMethod::cctpfa>
{
using FVGridGeometry = typename FVElementGeometry::FVGridGeometry;
using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace;
@@ -90,7 +90,7 @@ public:
* \tparam FVElementGeometry The local view on the finite volume grid geometry
*/
template<class FVElementGeometry>
-class FluxStencil<FVElementGeometry, DiscretizationMethods::CCMpfa>
+class FluxStencil<FVElementGeometry, DiscretizationMethod::ccmpfa>
{
using FVGridGeometry = typename FVElementGeometry::FVGridGeometry;
using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace;
diff --git a/dumux/discretization/fourierslaw.hh b/dumux/discretization/fourierslaw.hh
index ff5efe572860cac26bc03c419dfb39a3102389d1..f410544ecffd885a7723c1b183f0265da0aff6ee 100644
--- a/dumux/discretization/fourierslaw.hh
+++ b/dumux/discretization/fourierslaw.hh
@@ -32,7 +32,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods Method>
+template <class TypeTag, DiscretizationMethod Method>
class FouriersLawImplementation
{};
diff --git a/dumux/discretization/fourierslawnonequilibrium.hh b/dumux/discretization/fourierslawnonequilibrium.hh
index de17493a9887a5278b6e3e82486f0647296c2fa6..6d95dff865a84f24b55f653b5dc9724dfc001ed3 100644
--- a/dumux/discretization/fourierslawnonequilibrium.hh
+++ b/dumux/discretization/fourierslawnonequilibrium.hh
@@ -30,7 +30,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods Method>
+template <class TypeTag, DiscretizationMethod Method>
class FouriersLawNonEquilibriumImplementation
{};
diff --git a/dumux/discretization/maxwellstefanslaw.hh b/dumux/discretization/maxwellstefanslaw.hh
index 15970c2d0e7d5e6a116bbad9bf4b24071dc03029..f840460d50109c8e0a93f80f823854d2adf90148 100644
--- a/dumux/discretization/maxwellstefanslaw.hh
+++ b/dumux/discretization/maxwellstefanslaw.hh
@@ -30,7 +30,7 @@
namespace Dumux
{
// forward declaration
-template <class TypeTag, DiscretizationMethods Method>
+template <class TypeTag, DiscretizationMethod Method>
class MaxwellStefansLawImplementation
{};
diff --git a/dumux/discretization/methods.hh b/dumux/discretization/methods.hh
index d6a216a4d350c9c04f0fb03fa8a1ece8525aa9b9..09715a575548dcf13bb82288ddf7e296e86c0203 100644
--- a/dumux/discretization/methods.hh
+++ b/dumux/discretization/methods.hh
@@ -24,8 +24,8 @@
#ifndef DUMUX_DISCRETIZARION_METHODS_HH
#define DUMUX_DISCRETIZARION_METHODS_HH
-namespace Dumux
-{
+namespace Dumux {
+
/*!
* \brief The available discretization methods in Dumux
* \ingroup Discretization
@@ -33,9 +33,9 @@ namespace Dumux
* the class in question is not specific to a a discretization method
* or the classification is non-applicable
*/
- enum class DiscretizationMethods : unsigned int
+ enum class DiscretizationMethod
{
- None, Box, CCTpfa, CCMpfa, Staggered
+ none, box, cctpfa, ccmpfa, staggered
};
} // end namespace Dumux
diff --git a/dumux/discretization/scvoperator.hh b/dumux/discretization/scvoperator.hh
index b3ecc81424e642c08bfabe6289395fa110904558..aa4cb895566e0b0a08d591129a809de6e65f2111 100644
--- a/dumux/discretization/scvoperator.hh
+++ b/dumux/discretization/scvoperator.hh
@@ -40,7 +40,7 @@ class SubControlVolumeOperatorImplementation;
*/
template<class TypeTag>
using SubControlVolumeOperator DUNE_DEPRECATED_MSG("Use evalSolution() instead") =
- SubControlVolumeOperatorImplementation<TypeTag, (GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box)>;
+ SubControlVolumeOperatorImplementation<TypeTag, (GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box)>;
//! Specialization for the box method
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index f2f402e3b3e0322d16e7d6d63099372937725327..6d0c3883e9a08bed90b346fe948ba78985e1aa81 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -37,7 +37,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FicksLawImplementation;
/*!
@@ -45,7 +45,7 @@ class FicksLawImplementation;
* \brief Specialization of Fick's Law for the staggered free flow method.
*/
template <class TypeTag>
-class FicksLawImplementation<TypeTag, DiscretizationMethods::Staggered >
+class FicksLawImplementation<TypeTag, DiscretizationMethod::staggered >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -75,7 +75,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::Staggered >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::Staggered;
+ static const DiscretizationMethod myDiscretizationMethod = 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 4fb841a24493374e551ccf46fb6e710b348a0326..4456afce9cbaf7e510f48e8545ecd3647b79b95e 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -33,7 +33,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods discMethod>
+template<class TypeTag, DiscretizationMethod discMethod>
class FouriersLawImplementation;
/*!
@@ -41,7 +41,7 @@ class FouriersLawImplementation;
* \brief Specialization of Fourier's Law for the staggered free flow method.
*/
template <class TypeTag>
-class FouriersLawImplementation<TypeTag, DiscretizationMethods::Staggered >
+class FouriersLawImplementation<TypeTag, DiscretizationMethod::staggered >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -57,7 +57,7 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::Staggered >
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::Staggered;
+ static const DiscretizationMethod myDiscretizationMethod = 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 4a7d879d2074e5afee54a9560810e8f6ac60dc7a..c040e13779c2dea7b46a82dce75503eaf7f1637e 100644
--- a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
+++ b/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
@@ -35,7 +35,7 @@
namespace Dumux {
// forward declaration
-template <class TypeTag, DiscretizationMethods DM>
+template <class TypeTag, DiscretizationMethod DM>
class MaxwellStefansLawImplementation;
/*!
@@ -43,7 +43,7 @@ class MaxwellStefansLawImplementation;
* \brief Specialization of Maxwell Stefan's Law for the Staggered method.
*/
template <class TypeTag>
-class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethods::Staggered >
+class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethod::staggered >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -77,7 +77,7 @@ class MaxwellStefansLawImplementation<TypeTag, DiscretizationMethods::Staggered
public:
// state the discretization method this implementation belongs to
- static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::Staggered;
+ static const DiscretizationMethod myDiscretizationMethod = 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 da6214f28fdee00a4038f8bef81012aa7587a73c..99d029a35a9fe92222efbe066445cec63b5b7405 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 DiscretizationMethods discretizationMethod = DiscretizationMethods::Staggered;
+ static constexpr DiscretizationMethod discretizationMethod = 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/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 155c1b4279f71c3a57961a1e1d61e0b0c3a3310b..4292b0b87b60d058ccf8beb0a29565da872b721b 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -66,7 +66,7 @@ NEW_TYPE_TAG(StaggeredModel, INHERITS_FROM(FiniteVolumeModel));
//! Set the corresponding discretization method property
SET_PROP(StaggeredModel, DiscretizationMethod)
{
- static const DiscretizationMethods value = DiscretizationMethods::Staggered;
+ static const DiscretizationMethod value = DiscretizationMethod::staggered;
};
//! Set the default global face variables cache vector class
diff --git a/dumux/discretization/stationaryvelocityfield.hh b/dumux/discretization/stationaryvelocityfield.hh
index f43484483a625b8a54a6b94e714bc8adb44efdfb..a5d19e170dfd5a817b5d7bd8f85c8c4f23574d14 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 DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::None;
+ static const DiscretizationMethod myDiscretizationMethod = DiscretizationMethod::none;
//! state the type for the corresponding cache
using Cache = FluxVariablesCaching::EmptyAdvectionCache<TypeTag>;
diff --git a/dumux/discretization/upwindscheme.hh b/dumux/discretization/upwindscheme.hh
index e2056f47faf943f2889144b35f73fe47c2c2066a..2676be1ced3a6ee080e3c9e7921b3dd0ed989786 100644
--- a/dumux/discretization/upwindscheme.hh
+++ b/dumux/discretization/upwindscheme.hh
@@ -32,7 +32,7 @@ namespace Dumux
{
//! Forward declaration of the upwind scheme implementation
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class UpwindSchemeImplementation;
/*!
@@ -45,7 +45,7 @@ using UpwindScheme = UpwindSchemeImplementation<TypeTag, GET_PROP_VALUE(TypeTag,
//! Upwind scheme for the box method
template<class TypeTag>
-class UpwindSchemeImplementation<TypeTag, DiscretizationMethods::Box>
+class UpwindSchemeImplementation<TypeTag, DiscretizationMethod::box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -75,7 +75,7 @@ public:
//! Upwind scheme for the cell-centered tpfa scheme
template<class TypeTag>
-class UpwindSchemeImplementation<TypeTag, DiscretizationMethods::CCTpfa>
+class UpwindSchemeImplementation<TypeTag, DiscretizationMethod::cctpfa>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -190,8 +190,8 @@ public:
//! Upwind scheme for cell-centered mpfa schemes
template<class TypeTag>
-class UpwindSchemeImplementation<TypeTag, DiscretizationMethods::CCMpfa>
-: public UpwindSchemeImplementation<TypeTag, DiscretizationMethods::CCTpfa> {};
+class UpwindSchemeImplementation<TypeTag, DiscretizationMethod::ccmpfa>
+: public UpwindSchemeImplementation<TypeTag, DiscretizationMethod::cctpfa> {};
} // end namespace Dumux
diff --git a/dumux/freeflow/navierstokes/fluxvariables.hh b/dumux/freeflow/navierstokes/fluxvariables.hh
index 2bbcbd5a2b127a3f542663672e6d6bc7a02446c0..cc97f02886386193bc251ceb47736cb544bcef2d 100644
--- a/dumux/freeflow/navierstokes/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/fluxvariables.hh
@@ -32,7 +32,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesFluxVariablesImpl;
/*!
diff --git a/dumux/freeflow/navierstokes/fluxvariablescache.hh b/dumux/freeflow/navierstokes/fluxvariablescache.hh
index 5c83cae5221db7d35248caaf527807650622e561..af5dd14f5adef5cba876a3765e9622f4af053e14 100644
--- a/dumux/freeflow/navierstokes/fluxvariablescache.hh
+++ b/dumux/freeflow/navierstokes/fluxvariablescache.hh
@@ -30,7 +30,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class FreeFlowFluxVariablesCacheImplementation
{};
@@ -49,7 +49,7 @@ using FreeFlowFluxVariablesCache = FreeFlowFluxVariablesCacheImplementation<Type
* Specialization for the staggered grid discretization.
*/
template<class TypeTag>
-class FreeFlowFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::Staggered>
+class FreeFlowFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::staggered>
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/dumux/freeflow/navierstokes/localresidual.hh b/dumux/freeflow/navierstokes/localresidual.hh
index 602f21be720a0589ac5656ad95e6caf1bfafd0aa..09c3be1c7b617db2f7b9972e676669b393bf67a2 100644
--- a/dumux/freeflow/navierstokes/localresidual.hh
+++ b/dumux/freeflow/navierstokes/localresidual.hh
@@ -32,7 +32,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesResidualImpl;
/*!
diff --git a/dumux/freeflow/navierstokes/problem.hh b/dumux/freeflow/navierstokes/problem.hh
index 5cd86cf206c2a486db32b9321905b7a4476543fe..c67c71fad96cc6c6b8047dbc2208eeb90d06d64b 100644
--- a/dumux/freeflow/navierstokes/problem.hh
+++ b/dumux/freeflow/navierstokes/problem.hh
@@ -34,10 +34,10 @@ namespace Dumux
//! The implementation is specialized for the different discretizations
-template<class TypeTag, DiscretizationMethods DM> struct NavierStokesParentProblemImpl;
+template<class TypeTag, DiscretizationMethod DM> struct NavierStokesParentProblemImpl;
template<class TypeTag>
-struct NavierStokesParentProblemImpl<TypeTag, DiscretizationMethods::Staggered>
+struct NavierStokesParentProblemImpl<TypeTag, DiscretizationMethod::staggered>
{
using type = StaggeredFVProblem<TypeTag>;
};
@@ -120,7 +120,7 @@ public:
//! Applys the initial face solution (velocities on the faces). Specialization for staggered grid discretization.
template <class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Staggered, void>::type
+ typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::staggered, void>::type
applyInititalFaceSolution(SolutionVector& sol,
const SubControlVolumeFace& scvf,
const PrimaryVariables& initSol) const
diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
index aef12692654f2992a66a16133f121a09320256b7..2ba4a16ae127b1be013088b6e877ed88ef4b00b7 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh
@@ -32,7 +32,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesFluxVariablesImpl;
@@ -41,7 +41,7 @@ class NavierStokesFluxVariablesImpl;
* \brief The flux variables class for the Navier-Stokes model using the staggered grid discretization.
*/
template<class TypeTag>
-class NavierStokesFluxVariablesImpl<TypeTag, DiscretizationMethods::Staggered>
+class NavierStokesFluxVariablesImpl<TypeTag, DiscretizationMethod::staggered>
: public FluxVariablesBase<TypeTag>
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index 0f0cf6d4d7d64c801ec2b5cb2be213991d4a0780..c05c547a386f9da622c1b5db937a4c1a1e6bf56f 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -33,7 +33,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesResidualImpl;
/*!
@@ -41,7 +41,7 @@ class NavierStokesResidualImpl;
* \brief Element-wise calculation of the Navier-Stokes residual for models using the staggered discretization
*/
template<class TypeTag>
-class NavierStokesResidualImpl<TypeTag, DiscretizationMethods::Staggered>
+class NavierStokesResidualImpl<TypeTag, DiscretizationMethod::staggered>
: public StaggeredLocalResidual<TypeTag>
{
using ParentType = StaggeredLocalResidual<TypeTag>;
diff --git a/dumux/freeflow/navierstokes/vtkoutputfields.hh b/dumux/freeflow/navierstokes/vtkoutputfields.hh
index 46679784082c22571243bc5d2cdecedc48d59c60..58884cf84115b44fcb262111a304318a1e5d673d 100644
--- a/dumux/freeflow/navierstokes/vtkoutputfields.hh
+++ b/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<DiscretizationMethods method>
- using MethodType = std::integral_constant<DiscretizationMethods, method>;
+ template<DiscretizationMethod method>
+ using MethodType = std::integral_constant<DiscretizationMethod, method>;
public:
//! Initialize the Navier-Stokes specific vtk output fields.
@@ -74,7 +74,7 @@ private:
//! Adds discretization-specific fields (velocity vectors on the faces for the staggered discretization).
template <class VtkOutputModule>
- static void additionalOutput_(VtkOutputModule& vtk, MethodType<DiscretizationMethods::Staggered>)
+ static void additionalOutput_(VtkOutputModule& vtk, MethodType<DiscretizationMethod::staggered>)
{
const bool writeFaceVars = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.WriteFaceData", false);
if(writeFaceVars)
diff --git a/dumux/freeflow/navierstokesnc/fluxvariables.hh b/dumux/freeflow/navierstokesnc/fluxvariables.hh
index 247c16c01b6e8d328e57305b7d3ac0ae67625a27..f051e45d6fecaeaf3fa9663d8b77ef6f090ea544 100644
--- a/dumux/freeflow/navierstokesnc/fluxvariables.hh
+++ b/dumux/freeflow/navierstokesnc/fluxvariables.hh
@@ -32,7 +32,7 @@ namespace Dumux
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesNCFluxVariablesImpl;
/*!
diff --git a/dumux/freeflow/navierstokesnc/localresidual.hh b/dumux/freeflow/navierstokesnc/localresidual.hh
index f8fcb80d48d16bafe13f3c82f3befedc204dbea7..71794a760e708d881c559cce3303df40f999b1a4 100644
--- a/dumux/freeflow/navierstokesnc/localresidual.hh
+++ b/dumux/freeflow/navierstokesnc/localresidual.hh
@@ -33,7 +33,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesNCResidualImpl;
/*!
diff --git a/dumux/freeflow/navierstokesnc/staggered/fluxvariables.hh b/dumux/freeflow/navierstokesnc/staggered/fluxvariables.hh
index f7123db0cf6b09d32cf678905c0ca36d393c687e..19881512ce8bf2e677820dab8d165d992c1bd1ee 100644
--- a/dumux/freeflow/navierstokesnc/staggered/fluxvariables.hh
+++ b/dumux/freeflow/navierstokesnc/staggered/fluxvariables.hh
@@ -34,7 +34,7 @@ namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesNCFluxVariablesImpl;
/*!
@@ -42,7 +42,7 @@ class NavierStokesNCFluxVariablesImpl;
* \brief The flux variables class for the multi-component Navier-Stokes model using the staggered grid discretization.
*/
template<class TypeTag>
-class NavierStokesNCFluxVariablesImpl<TypeTag, DiscretizationMethods::Staggered>
+class NavierStokesNCFluxVariablesImpl<TypeTag, DiscretizationMethod::staggered>
: public NavierStokesFluxVariables<TypeTag>
{
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
diff --git a/dumux/freeflow/navierstokesnc/staggered/localresidual.hh b/dumux/freeflow/navierstokesnc/staggered/localresidual.hh
index 0e764a3290efa82c0a9637fbbe87aef76bc28fd0..b82420a50188eeaad02ae1c1b495f8671fc0be1b 100644
--- a/dumux/freeflow/navierstokesnc/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokesnc/staggered/localresidual.hh
@@ -32,7 +32,7 @@
namespace Dumux {
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class NavierStokesNCResidualImpl;
/*!
@@ -40,7 +40,7 @@ class NavierStokesNCResidualImpl;
* \brief Element-wise calculation of the multi-component Navier-Stokes residual for models using the staggered discretization
*/
template<class TypeTag>
-class NavierStokesNCResidualImpl<TypeTag, DiscretizationMethods::Staggered>
+class NavierStokesNCResidualImpl<TypeTag, DiscretizationMethod::staggered>
: public NavierStokesResidual<TypeTag>
{
using ParentType = NavierStokesResidual<TypeTag>;
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index c289d9bf39714a86fc4bf4bdf16b833a7280ceae..128c8055398b2a74d3b305d24b44b12d9f600f7a 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -371,7 +371,7 @@ std::vector<int> GridCreatorBase<Grid>::boundaryMarkers_;
* from information in the input file. This class is specialised below for all
* supported grid managers. It inherits the functionality of the base class.
*/
-template <class Grid, DiscretizationMethods DM>
+template <class Grid, DiscretizationMethod DM>
class GridCreatorImpl : public GridCreatorBase<Grid> {};
/*!
@@ -392,7 +392,7 @@ using GridCreator = GridCreatorImpl<typename GET_PROP_TYPE(TypeTag, Grid), GET_P
* \brief Helper class for determining the default overlap in case of parallel yasp grids
* \note the default of 1 works for all overlapping implementation like the cell-centered discretization schemes
*/
-template <DiscretizationMethods DM>
+template <DiscretizationMethod DM>
struct YaspOverlapHelper
{
static int getOverlap(const std::string& modelParamGroup)
@@ -406,7 +406,7 @@ struct YaspOverlapHelper
//! specialization for the box method
template <>
-struct YaspOverlapHelper<DiscretizationMethods::Box>
+struct YaspOverlapHelper<DiscretizationMethod::box>
{
static int getOverlap(const std::string& modelParamGroup)
{ return 0; }
@@ -429,7 +429,7 @@ struct YaspOverlapHelper<DiscretizationMethods::Box>
* - Refinement : the number of global refines to apply initially.
*
*/
-template<DiscretizationMethods DiscMethod, class ct, int dim>
+template<DiscretizationMethod DiscMethod, class ct, int dim>
class GridCreatorImpl<Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> >, DiscMethod>
: public GridCreatorBase<Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> > >
{
@@ -524,7 +524,7 @@ private:
* - Refinement : the number of global refines to apply initially.
*
*/
-template<DiscretizationMethods DiscMethod, class ct, int dim>
+template<DiscretizationMethod DiscMethod, class ct, int dim>
class GridCreatorImpl<Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> >, DiscMethod>
: public GridCreatorBase<Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> > >
{
@@ -630,7 +630,7 @@ private:
* \f$ g = -\frac{1}{g_\textrm{negative}} \f$
* to avoid issues with imprecise fraction numbers.
*/
-template<DiscretizationMethods DiscMethod, class ctype, int dim>
+template<DiscretizationMethod DiscMethod, class ctype, int dim>
class GridCreatorImpl<Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ctype, dim> >, DiscMethod>
: public GridCreatorBase<Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ctype, dim> > >
{
@@ -858,7 +858,7 @@ private:
* - Refinement : the number of global refines to apply initially.
*
*/
-template<DiscretizationMethods DiscMethod>
+template<DiscretizationMethod DiscMethod>
class GridCreatorImpl<Dune::OneDGrid, DiscMethod>
: public GridCreatorBase<Dune::OneDGrid>
{
@@ -953,7 +953,7 @@ private:
* - BoundarySegments : whether to insert boundary segments into the grid
*
*/
-template<DiscretizationMethods DiscMethod, int dim>
+template<DiscretizationMethod DiscMethod, int dim>
class GridCreatorImpl<Dune::UGGrid<dim>, DiscMethod>
: public GridCreatorBase<Dune::UGGrid<dim> >
{
@@ -1060,7 +1060,7 @@ private:
* - BoundarySegments : whether to insert boundary segments into the grid
*
*/
-template<DiscretizationMethods DiscMethod, int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
+template<DiscretizationMethod DiscMethod, int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
class GridCreatorImpl<Dune::ALUGrid<dim, dimworld, elType, refinementType>, DiscMethod>
: public GridCreatorBase<Dune::ALUGrid<dim, dimworld, elType, refinementType> >
{
@@ -1145,7 +1145,7 @@ public:
* - Cells : number of elements in a structured grid
*
*/
-template<DiscretizationMethods DiscMethod, int dim, int dimworld>
+template<DiscretizationMethod DiscMethod, int dim, int dimworld>
class GridCreatorImpl<Dune::FoamGrid<dim, dimworld>, DiscMethod>
: public GridCreatorBase<Dune::FoamGrid<dim, dimworld> >
{
@@ -1199,7 +1199,7 @@ public:
* - Cells : number of elements in a structured grid
*
*/
-template<DiscretizationMethods DiscMethod, int dimworld>
+template<DiscretizationMethod DiscMethod, int dimworld>
class GridCreatorImpl<Dune::FoamGrid<1, dimworld>, DiscMethod>
: public GridCreatorBase<Dune::FoamGrid<1, dimworld> >
{
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
index b366093542cf041b3468c4e35e59d2862f1e336f..d31f06a8bcfa93b3e1fe9a04caac31585db6b1db 100644
--- a/dumux/io/vtkoutputmodule.hh
+++ b/dumux/io/vtkoutputmodule.hh
@@ -235,7 +235,7 @@ class VtkOutputModule
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
static constexpr int dofCodim = isBox ? dim : 0;
struct VolVarScalarDataInfo { std::function<Scalar(const VolumeVariables&)> get; std::string name; };
diff --git a/dumux/linear/amgtraits.hh b/dumux/linear/amgtraits.hh
index 7ccb7d1204c2fd383107026d188471449bc3654f..131d834f1d2fcd7fb60548332dd648ac9abc56ae 100644
--- a/dumux/linear/amgtraits.hh
+++ b/dumux/linear/amgtraits.hh
@@ -38,7 +38,7 @@
namespace Dumux {
//! The implementation is specialized for the different discretizations
-template<class TypeTag, DiscretizationMethods DM> struct AmgTraitsImpl;
+template<class TypeTag, DiscretizationMethod DM> struct AmgTraitsImpl;
//! The type traits required for using the AMG backend
template<class TypeTag>
@@ -69,7 +69,7 @@ public:
//! Box: use the non-overlapping AMG
template<class TypeTag>
-struct AmgTraitsImpl<TypeTag, DiscretizationMethods::Box>
+struct AmgTraitsImpl<TypeTag, DiscretizationMethod::box>
{
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
@@ -116,7 +116,7 @@ public:
//! Cell-centered tpfa: use the overlapping AMG
template<class TypeTag>
-struct AmgTraitsImpl<TypeTag, DiscretizationMethods::CCTpfa>
+struct AmgTraitsImpl<TypeTag, DiscretizationMethod::cctpfa>
{
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
@@ -140,8 +140,8 @@ struct AmgTraitsImpl<TypeTag, DiscretizationMethods::CCTpfa>
};
template<class TypeTag>
-struct AmgTraitsImpl<TypeTag, DiscretizationMethods::CCMpfa>
-: public AmgTraitsImpl<TypeTag, DiscretizationMethods::CCTpfa> {};
+struct AmgTraitsImpl<TypeTag, DiscretizationMethod::ccmpfa>
+: public AmgTraitsImpl<TypeTag, DiscretizationMethod::cctpfa> {};
} // end namespace Dumux
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index f15df6e9a5f45e6c82a40de99c8332c3095966d6..8ef908e0c4a29046e342b7c71121a4587b556186 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -89,7 +89,7 @@ class ElectroChemistry
energyEqIdx = FluidSystem::numComponents //energy equation
};
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
enum { dofCodim = isBox ? GridView::dimension : 0 };
using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index 907fd1b67122089a23ff2c1e9bb4bbdb9f4c13fd..e3f60f3f15b9db92ea4208867b87ff024264171a 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -64,7 +64,7 @@ class ElectroChemistryNI : public ElectroChemistry<TypeTag, electroChemistryMode
energyEqIdx = FluidSystem::numComponents, //energy equation
};
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
enum { dofCodim = isBox ? GridView::dimension : 0 };
using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
diff --git a/dumux/nonlinear/privarswitchnewtonsolver.hh b/dumux/nonlinear/privarswitchnewtonsolver.hh
index 494cd33537775ed084851972c4b03542fb40c691..ce599c9b165c94d72d30ce88a8e22bd591336d62 100644
--- a/dumux/nonlinear/privarswitchnewtonsolver.hh
+++ b/dumux/nonlinear/privarswitchnewtonsolver.hh
@@ -53,7 +53,7 @@ class PriVarSwitchNewtonSolver : public NewtonSolver<Assembler, LinearSolver>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
static constexpr auto discretizationMethod = Assembler::FVGridGeometry::discretizationMethod;
- static constexpr bool isBox = discretizationMethod == DiscretizationMethods::Box;
+ static constexpr bool isBox = discretizationMethod == DiscretizationMethod::box;
public:
using ParentType::ParentType;
diff --git a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
index 6d7e394c0199d18adc179ba2b4479c3ffbf7dfb1..46fc69fb6563f881abb96fa2b1a54bccf9be4eb2 100644
--- a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
+++ b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
@@ -81,7 +81,7 @@ public:
//! flux derivatives for the cell-centered tpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCTpfa, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::cctpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -107,7 +107,7 @@ public:
//! flux derivatives for the cell-centered mpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCMpfa, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::ccmpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -165,7 +165,7 @@ public:
//! flux derivatives for the box scheme
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
@@ -203,7 +203,7 @@ public:
//! Dirichlet flux derivatives for the cell-centered tpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCTpfa, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::cctpfa, void>
addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -223,7 +223,7 @@ public:
//! Dirichlet flux derivatives for the cell-centered mpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCMpfa, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::ccmpfa, void>
addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index 46ce02a3116a2c511588bf3fc188b4435323c22d..edeba43b582f54b65552a15ad49413bb0c9baf4d 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -68,7 +68,7 @@ class TwoPGridDataTransfer : public GridDataTransfer
static constexpr int dim = Grid::dimension;
static constexpr int dimWorld = Grid::dimensionworld;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
// export some indices
enum {
diff --git a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
index e5279b06bb9f88a0d38ff6df4d9e1502143ff5e7..3d6b14511d908cfd42c73142f9e2ef6f36f2b45a 100644
--- a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
+++ b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
@@ -146,7 +146,7 @@ public:
* \param scv The sub control volume
*/
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCTpfa, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::cctpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -262,7 +262,7 @@ public:
* \param scv The sub control volume
*/
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 867a66d4cf2d43bfb3e51a4932e51c2e59d30a1f..b5a66c978c85a52e2bea953a288ef6c43d417dc9 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -80,7 +80,7 @@ class PrimaryVariableSwitch
using Element = typename GridView::template Codim<0>::Entity;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
enum { dim = GridView::dimension };
public:
diff --git a/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh b/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh
index e91a14475890e83a3126abebecd170e037d43f40..12915410fa4c5e6fd6bc49b459668836d373b0c1 100644
--- a/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh
+++ b/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh
@@ -55,7 +55,7 @@ PriVarSwitchNewtonController : public NewtonController<typename GET_PROP_TYPE(Ty
using PrimaryVariableSwitch = typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
using ParentType::ParentType;
diff --git a/dumux/porousmediumflow/fluxvariablescache.hh b/dumux/porousmediumflow/fluxvariablescache.hh
index f775ba98a54191ed594749a48b5f2ac79da3b0a7..23d36965f53b884de2bebc435f461135754b844d 100644
--- a/dumux/porousmediumflow/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/fluxvariablescache.hh
@@ -32,7 +32,7 @@
namespace Dumux
{
// forward declaration
-template<class TypeTag, DiscretizationMethods Method>
+template<class TypeTag, DiscretizationMethod Method>
class PorousMediumFluxVariablesCacheImplementation;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -54,7 +54,7 @@ using PorousMediumFluxVariablesCache = PorousMediumFluxVariablesCacheImplementat
//! We only store discretization-related quantities for the box method.
//! Thus, we need no physics-dependent specialization.
template<class TypeTag>
-class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::Box>
+class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -136,7 +136,7 @@ template<class TypeTag> class EnergyCacheChooser<TypeTag, true> : public GET_PRO
// specialization for the cell centered tpfa method
template<class TypeTag>
-class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCTpfa>
+class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::cctpfa>
: public AdvectionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>
, public DiffusionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>
, public EnergyCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
@@ -145,7 +145,7 @@ class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod
//! specialization of the flux variables cache for the cell centered finite volume mpfa scheme
//! stores data which is commonly used by all the different types of processes
template<class TypeTag>
-class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCMpfa>
+class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod::ccmpfa>
: public AdvectionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>
, public DiffusionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>
, public EnergyCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
diff --git a/dumux/porousmediumflow/nonequilibrium/gridvariables.hh b/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
index f997593b906427381592e0d0a5e5295946dd06a6..33e77c481a142574449e0114de6c3ede4f8e7aa4 100644
--- a/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
+++ b/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
@@ -54,7 +54,7 @@ class NonEquilibriumGridVariables: public FVGridVariables<TypeTag>
using GlobalPosition = Dune::FieldVector<typename GridView::Grid::ctype, dimWorld>;
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
//! Constructor
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 21b730f9990a7254ed25377570af3a4bc2055eaa..4d4b29fedd49b359830ec5f162ef955787f09c7e 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -102,7 +102,7 @@ namespace Properties
SET_PROP(SequentialModel, DiscretizationMethod)
{
- static const DiscretizationMethods value = DiscretizationMethods::CCTpfa;
+ static const DiscretizationMethod value = DiscretizationMethod::cctpfa;
};
//! Type of the jacobian matrix needed for compatibility with implicit models for the amg backend
diff --git a/dumux/porousmediumflow/tracer/localresidual.hh b/dumux/porousmediumflow/tracer/localresidual.hh
index 09f1fdefec77d8fb71ef407c7c547c3c18096ffb..57b220d3bf9b65bd198d31ac1d647cd4c75a6b75 100644
--- a/dumux/porousmediumflow/tracer/localresidual.hh
+++ b/dumux/porousmediumflow/tracer/localresidual.hh
@@ -206,7 +206,7 @@ public:
}
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethod::box, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -250,7 +250,7 @@ public:
}
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/velocityoutput.hh b/dumux/porousmediumflow/velocityoutput.hh
index 39531318fa872d2c13bb7dd33b6ee4897fa4866c..9af0411289be7499d0a2d7d2b9da4931cdf1265a 100644
--- a/dumux/porousmediumflow/velocityoutput.hh
+++ b/dumux/porousmediumflow/velocityoutput.hh
@@ -61,7 +61,7 @@ class PorousMediumFlowVelocityOutput
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
- static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
static const int dofCodim = isBox ? dim : 0;
using Vertex = typename GridView::template Codim<dim>::Entity;
@@ -123,13 +123,13 @@ public:
// following lines, that call will only be compiled if cell-centered
// actually is used.
template <class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, BoundaryTypes>::type
+ typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethod::box, BoundaryTypes>::type
problemBoundaryTypes(const Element& element, const SubControlVolumeFace& scvf) const
{ return problem_.boundaryTypes(element, scvf); }
//! we should never call this method for box models
template <class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, BoundaryTypes>::type
+ typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethod::box, BoundaryTypes>::type
problemBoundaryTypes(const Element& element, const SubControlVolumeFace& scvf) const
{ return BoundaryTypes(); }
diff --git a/test/io/gridcreator/test_gridcreator_gmsh.cc b/test/io/gridcreator/test_gridcreator_gmsh.cc
index eef7ece4f34c2f9a619fea16bdb01906cdc49659..44612313c3c09add3a1e7e4b4e5827932b65f87b 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh.cc
+++ b/test/io/gridcreator/test_gridcreator_gmsh.cc
@@ -42,7 +42,7 @@ namespace Properties
SET_TYPE_PROP(GridCreatorGmshTest, Scalar, double);
SET_STRING_PROP(GridCreatorGmshTest, ModelParameterGroup, "Bifurcation");
SET_PROP(GridCreatorGmshTest, DiscretizationMethod) {
- static constexpr DiscretizationMethods value = DiscretizationMethods::CCTpfa;
+ static constexpr DiscretizationMethod value = DiscretizationMethod::cctpfa;
};
}
diff --git a/test/io/gridcreator/test_gridcreator_subgrid.cc b/test/io/gridcreator/test_gridcreator_subgrid.cc
index 857ade51df74dcf985f2f276ee88b116c41d029f..61dfc31f5b9c6516281fd816ab095ebff76560f3 100644
--- a/test/io/gridcreator/test_gridcreator_subgrid.cc
+++ b/test/io/gridcreator/test_gridcreator_subgrid.cc
@@ -67,7 +67,7 @@ int main(int argc, char** argv) try
Dune::Timer timer;
using HostGrid = Dune::YaspGrid<dim, Dune::TensorProductCoordinates<double, dim> >;
- using HostGridCreator = GridCreatorImpl<HostGrid, DiscretizationMethods::None>;
+ using HostGridCreator = GridCreatorImpl<HostGrid, DiscretizationMethod::none>;
HostGridCreator::makeGrid();
// Calculate the bounding box of the host grid view.
diff --git a/test/porousmediumflow/1p/implicit/tubesproblem.hh b/test/porousmediumflow/1p/implicit/tubesproblem.hh
index 2878bd7f1cf57587a43a28693f663a20094620b8..8da64e4359ce51621edc16e7968551f85cc697b5 100644
--- a/test/porousmediumflow/1p/implicit/tubesproblem.hh
+++ b/test/porousmediumflow/1p/implicit/tubesproblem.hh
@@ -101,7 +101,7 @@ class TubesTestProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
+ enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box };
public:
TubesTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
diff --git a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
index 6aa5e01fe969a08f25e8552adcb5b2eaa9eea943..51a7d70eac58b0570f364e99267f0ce4b1ac0f15 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
@@ -130,7 +130,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
//! property that defines whether mole or mass fractions are used
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static const auto phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
- static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index 4967e6863fcc36943d289ecb1a55ad4320991371..3debf5c193fc155350acaf117eaf2f439745cff0 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -142,7 +142,7 @@ public:
boundaryVaporMoleFrac_ = getParam<Scalar>("Problem.BoundaryMoleFraction");
boundaryTemperature_ = getParam<Scalar>("Problem.BoundaryTemperature");
- unsigned int codim = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box ? dim : 0;
+ unsigned int codim = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box ? dim : 0;
permeability_.resize(fvGridGeometry->gridView().size(codim));
porosity_.resize(fvGridGeometry->gridView().size(codim));
reactionRate_.resize(fvGridGeometry->gridView().size(codim));
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
index 054396b5e5e1427c9084e7bf38144bcd438ba15f..1565b5856ae7870f5709cf6cbc53856b5584be31 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
@@ -116,7 +116,7 @@ class TwoPTwoCComparisonProblem
};
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
/*!
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index 71b18bad20a1489afa27d18ba2998327000cc436..52b2e7c1928d05390778c9028f42e12e2cd19aba 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -112,7 +112,7 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
enum { dofCodim = isBox ? dim : 0 };
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
index 0e83673507d309a94eb798d870a7b21a844e7d0d..50772904553d8b502bb4289af96ae90ed1327d2f 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
@@ -161,7 +161,7 @@ public:
temperatureHigh_ = getParam<Scalar>("FluidSystem.TemperatureHigh");
name_ = getParam<std::string>("Problem.Name");
- unsigned int codim = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box ? dim : 0;
+ unsigned int codim = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box ? dim : 0;
permeability_.resize(fvGridGeometry->gridView().size(codim));
FluidSystem::init(/*Tmin=*/temperatureLow_,
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
index 1a8a78ce95022408e5c90a5b27737726f9e27cc2..219cba0a96b61d29960b97c1abf2a6c185046ff2 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
@@ -119,7 +119,7 @@ class MPNCComparisonProblem
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethod::box;
public:
/*!