diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh
index 20b90ab00392c6520edf8bb50cfbfec06f596427..555edde9b550ac81e4a119ebe353a61ece5cbb51 100644
--- a/dumux/adaptive/initializationindicator.hh
+++ b/dumux/adaptive/initializationindicator.hh
@@ -52,7 +52,7 @@ class GridAdaptInitializationIndicator
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box;
public:
diff --git a/dumux/assembly/fclocalassembler.hh b/dumux/assembly/fclocalassembler.hh
index c9d7dc1f81acf31a2bd13b158ce6aa6f20d84c9a..c58f85ba126bd267cf080a3f8b6bf8e3865e92eb 100644
--- a/dumux/assembly/fclocalassembler.hh
+++ b/dumux/assembly/fclocalassembler.hh
@@ -477,7 +477,7 @@ public:
}
// also consider lateral faces outside the own element for face-centered staggered schemes
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::fcstaggered)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::fcstaggered)
{
if (scvf.isLateral())
{
@@ -509,7 +509,7 @@ public:
}
// also consider lateral faces outside the own element for face-centered staggered schemes
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::fcstaggered)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::fcstaggered)
{
if (scvf.isLateral())
{
@@ -549,7 +549,7 @@ public:
}
// also consider lateral faces outside the own element for face-centered staggered schemes
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::fcstaggered)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::fcstaggered)
{
// treat normal/parallel scvs for parallel runs TODO description, put in function
if (problem.gridGeometry().gridView().comm().size() > 1 && element.partitionType() == Dune::InteriorEntity)
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 471ab2ed972cea0b2a6068d1110cf79e8a0279a9..41a7c5f47946cf9c81c08f769a5cd7b9cf6948f3 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -423,7 +423,7 @@ public:
//! Compute the derivative of the flux residual
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod != DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod != DiscretizationMethods::box, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -437,7 +437,7 @@ public:
//! Compute the derivative of the flux residual for the box method
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/assembly/initialsolution.hh b/dumux/assembly/initialsolution.hh
index dc8bf7ebf3a04615577efcac8d7c40de4c726cd6..4054253e0c3f29af95e895b3a407f9cd75053ad8 100644
--- a/dumux/assembly/initialsolution.hh
+++ b/dumux/assembly/initialsolution.hh
@@ -43,7 +43,7 @@ void assembleInitialSolution(SolutionVector& sol, const Problem& problem)
using GridGeometry = std::decay_t<decltype(gg)>;
// box method
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::box)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::box)
{
constexpr int dim = GridGeometry::GridView::dimension;
const auto numDofs = gg.vertexMapper().size();
@@ -79,7 +79,7 @@ void assembleInitialSolution(SolutionVector& sol, const Problem& problem)
}
// staggered methods
- else if constexpr (GridGeometry::discMethod == DiscretizationMethod::staggered)
+ else if constexpr (GridGeometry::discMethod == DiscretizationMethods::staggered)
{
problem.applyInitialSolution(sol);
}
diff --git a/dumux/assembly/jacobianpattern.hh b/dumux/assembly/jacobianpattern.hh
index 2dd733cef371086cb3a9fe36955f6e7bc2516ded..e28de66b28af5c4f7f35d6bc93e7b61ec43cabcb 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::discMethod == DiscretizationMethod::box), int> = 0>
+ typename std::enable_if_t<(GridGeometry::discMethod == DiscretizationMethods::box), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{
const auto numDofs = gridGeometry.numDofs();
@@ -84,8 +84,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::discMethod == DiscretizationMethod::cctpfa)
- || (GridGeometry::discMethod == DiscretizationMethod::ccmpfa) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethods::cctpfa)
+ || (GridGeometry::discMethod == DiscretizationMethods::ccmpfa) ), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{
const auto numDofs = gridGeometry.numDofs();
@@ -118,7 +118,7 @@ Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
* \brief Helper function to generate Jacobian pattern for the staggered method
*/
template<bool isImplicit, class GridGeometry,
- typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethod::staggered) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethods::staggered) ), int> = 0>
auto getJacobianPattern(const GridGeometry& gridGeometry)
{
// resize the jacobian and the residual
@@ -200,7 +200,7 @@ Dune::MatrixIndexSet getFEJacobianPattern(const FEBasis& feBasis)
* in fem is the same independent of the time discretization scheme.
*/
template<bool isImplicit, class GridGeometry,
- typename std::enable_if_t<(GridGeometry::discMethod == DiscretizationMethod::fem), int> = 0>
+ typename std::enable_if_t<(GridGeometry::discMethod == DiscretizationMethods::fem), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{ return getFEJacobianPattern(gridGeometry.feBasis()); }
@@ -209,7 +209,7 @@ Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
* \brief Helper function to generate Jacobian pattern for the face-centered staggered method
*/
template<bool isImplicit, class GridGeometry,
- typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethod::fcstaggered) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometry::discMethod == DiscretizationMethods::fcstaggered) ), int> = 0>
Dune::MatrixIndexSet getJacobianPattern(const GridGeometry& gridGeometry)
{
// resize the jacobian and the residual
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index b81375dca7b05a028d76825f2a1937d6f8f6ceb9..7f53a85ae08d03cde982b8b983cbab2d689a7d29 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -71,8 +71,8 @@ class FVProblem
using PointSourceMap = std::map< std::pair<std::size_t, std::size_t>,
std::vector<PointSource> >;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
- static constexpr bool isStaggered = GridGeometry::discMethod == DiscretizationMethod::staggered;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
+ static constexpr bool isStaggered = GridGeometry::discMethod == DiscretizationMethods::staggered;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index 3eda1766f34c5603eaab2b30464e9f2f4b48dc0b..eaf3b3f6bd901c2b07a52964bdb3fcf9b63ed353 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -301,7 +301,7 @@ public:
// split the source values equally among all concerned entities
source.setEmbeddings(entities.size()*source.embeddings());
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::box)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::box)
{
// loop over all concerned elements
auto fvGeometry = localView(gridGeometry);
diff --git a/dumux/discretization/box/elementsolution.hh b/dumux/discretization/box/elementsolution.hh
index caf00f7fd8595172fcbfbd729ecbce4f6c468bf5..c11c145582f05a57d8d4fded5086ad8214af68a1 100644
--- a/dumux/discretization/box/elementsolution.hh
+++ b/dumux/discretization/box/elementsolution.hh
@@ -116,7 +116,7 @@ private:
*/
template<class Element, class SolutionVector, class GridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg)
--> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethod::box,
+-> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethods::box,
BoxElementSolution<typename GridGeometry::LocalView,
std::decay_t<decltype(std::declval<SolutionVector>()[0])>>
>
@@ -131,7 +131,7 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const Gr
*/
template<class Element, class ElementVolumeVariables, class FVElementGeometry>
auto elementSolution(const Element& element, const ElementVolumeVariables& elemVolVars, const FVElementGeometry& gg)
--> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::box,
+-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::box,
BoxElementSolution<FVElementGeometry,
typename ElementVolumeVariables::VolumeVariables::PrimaryVariables>>
{
diff --git a/dumux/discretization/box/scvftoscvboundarytypes.hh b/dumux/discretization/box/scvftoscvboundarytypes.hh
index 12ec51306d6d21532ef0c317815f1470df918009..d4b540a9fb348d6a530e46b079b21e677783df97 100644
--- a/dumux/discretization/box/scvftoscvboundarytypes.hh
+++ b/dumux/discretization/box/scvftoscvboundarytypes.hh
@@ -44,7 +44,7 @@ public:
void computeBoundaryTypes(const Problem& problem)
{
// only do something for box
- if (discMethod == DiscretizationMethod::box)
+ if (discMethod == DiscretizationMethods::box)
{
const auto& gridGeometry = problem.gridGeometry();
scvBoundaryTypes.resize(gridGeometry.vertexMapper().size());
@@ -81,7 +81,7 @@ public:
template<class SubControlVolume>
const BoundaryTypes& boundaryTypes(const SubControlVolume& scv) const
{
- if (discMethod == DiscretizationMethod::box)
+ if (discMethod == DiscretizationMethods::box)
return scvBoundaryTypes[scv.dofIndex()];
else
DUNE_THROW(Dune::InvalidStateException, "Only use this for the box discretization!");
diff --git a/dumux/discretization/cellcentered/elementsolution.hh b/dumux/discretization/cellcentered/elementsolution.hh
index 5aabd0934e329694e58a65ba5ab512c42e05089d..c8b23c16c79ef0567f5313bf04a4ea08cfec21cf 100644
--- a/dumux/discretization/cellcentered/elementsolution.hh
+++ b/dumux/discretization/cellcentered/elementsolution.hh
@@ -111,8 +111,8 @@ private:
*/
template<class Element, class SolutionVector, class GridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg)
--> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
- GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
+-> std::enable_if_t<GridGeometry::discMethod == DiscretizationMethods::cctpfa ||
+ GridGeometry::discMethod == DiscretizationMethods::ccmpfa,
CCElementSolution<typename GridGeometry::LocalView,
std::decay_t<decltype(std::declval<SolutionVector>()[0])>>
>
@@ -127,8 +127,8 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const Gr
*/
template<class Element, class ElementVolumeVariables, class FVElementGeometry>
auto elementSolution(const Element& element, const ElementVolumeVariables& elemVolVars, const FVElementGeometry& gg)
--> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
- FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
+-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::cctpfa ||
+ FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::ccmpfa,
CCElementSolution<FVElementGeometry, typename ElementVolumeVariables::VolumeVariables::PrimaryVariables>>
{
using PrimaryVariables = typename ElementVolumeVariables::VolumeVariables::PrimaryVariables;
@@ -142,8 +142,8 @@ auto elementSolution(const Element& element, const ElementVolumeVariables& elemV
*/
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(PrimaryVariables&& priVars)
--> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
- FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
+-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::cctpfa ||
+ FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::ccmpfa,
CCElementSolution<FVElementGeometry, PrimaryVariables>>
{
return CCElementSolution<FVElementGeometry, PrimaryVariables>(std::move(priVars));
@@ -156,8 +156,8 @@ auto elementSolution(PrimaryVariables&& priVars)
*/
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(const PrimaryVariables& priVars)
--> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa ||
- FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa,
+-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::cctpfa ||
+ FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::ccmpfa,
CCElementSolution<FVElementGeometry, PrimaryVariables>>
{
return CCElementSolution<FVElementGeometry, PrimaryVariables>(priVars);
diff --git a/dumux/discretization/facecentered/staggered/elementsolution.hh b/dumux/discretization/facecentered/staggered/elementsolution.hh
index 535e632f4390467d6e9b1873642ff0e69f9bfdb8..05936fee71f52b62e4dc29d17788728055d97577 100644
--- a/dumux/discretization/facecentered/staggered/elementsolution.hh
+++ b/dumux/discretization/facecentered/staggered/elementsolution.hh
@@ -129,7 +129,7 @@ private:
template<class Element, class SolutionVector, class GridGeometry>
auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg)
-> std::enable_if_t<
- GridGeometry::discMethod == DiscretizationMethod::fcstaggered,
+ GridGeometry::discMethod == DiscretizationMethods::fcstaggered,
FaceCenteredStaggeredElementSolution<
typename GridGeometry::LocalView,
std::decay_t<decltype(std::declval<SolutionVector>()[0])>
@@ -144,7 +144,7 @@ auto elementSolution(const Element& element, const SolutionVector& sol, const Gr
template<class Element, class ElementVolumeVariables, class FVElementGeometry>
auto elementSolution(const Element& element, const ElementVolumeVariables& elemVolVars, const FVElementGeometry& gg)
-> std::enable_if_t<
- FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::fcstaggered,
+ FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::fcstaggered,
FaceCenteredStaggeredElementSolution<
FVElementGeometry,
typename ElementVolumeVariables::VolumeVariables::PrimaryVariables
@@ -160,7 +160,7 @@ auto elementSolution(const Element& element, const ElementVolumeVariables& elemV
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(PrimaryVariables&& priVars)
-> std::enable_if_t<
- FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::fcstaggered,
+ FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::fcstaggered,
FaceCenteredStaggeredElementSolution<
FVElementGeometry,
std::decay_t<PrimaryVariables>
diff --git a/dumux/discretization/staggered/elementsolution.hh b/dumux/discretization/staggered/elementsolution.hh
index ebb23bf2a6d5d736e78e18f6eec3e171616e7414..330745749daf769e9c9576928a01d8d32964fa09 100644
--- a/dumux/discretization/staggered/elementsolution.hh
+++ b/dumux/discretization/staggered/elementsolution.hh
@@ -60,7 +60,7 @@ using StaggeredElementSolution = Dune::BlockVector<PrimaryVariables>;
*/
template<class FVElementGeometry, class PrimaryVariables>
auto elementSolution(PrimaryVariables&& priVars)
--> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::staggered,
+-> std::enable_if_t<FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::staggered,
StaggeredElementSolution<PrimaryVariables>>
{
return StaggeredElementSolution<PrimaryVariables>({std::move(priVars)});
diff --git a/dumux/freeflow/navierstokes/momentum/fluxhelper.hh b/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
index 85b22772207a323ca9e21e3af7dc739d94b2b4fd..0382053f9f29a882d1e08439032bee6fde3e26df 100644
--- a/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
+++ b/dumux/freeflow/navierstokes/momentum/fluxhelper.hh
@@ -62,7 +62,7 @@ struct NavierStokesMomentumBoundaryFluxHelper
const bool zeroNormalVelocityGradient = true)
{
// TODO density upwinding?
- static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::fcstaggered);
+ static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::fcstaggered);
using NumEqVector = typename Problem::Traits::NumEqVector;
constexpr std::size_t dim = static_cast<std::size_t>(FVElementGeometry::GridGeometry::GridView::dimension);
static_assert(
@@ -213,7 +213,7 @@ struct NavierStokesMomentumBoundaryFluxHelper
const ElementFluxVariablesCache& elemFluxVarsCache,
const TangentialVelocityGradient& tangentialVelocityGradient = TangentialVelocityGradient(0.0))
{
- static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::fcstaggered);
+ static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::fcstaggered);
using NumEqVector = typename Problem::Traits::NumEqVector;
constexpr std::size_t dim = static_cast<std::size_t>(FVElementGeometry::GridGeometry::GridView::dimension);
static_assert(
diff --git a/dumux/freeflow/navierstokes/momentum/localresidual.hh b/dumux/freeflow/navierstokes/momentum/localresidual.hh
index 5db4a54c6229d27f9ae6aa240f6967d9aadf7e22..6b50f1c3b5578f53403ae649479ac0c38a20d37c 100644
--- a/dumux/freeflow/navierstokes/momentum/localresidual.hh
+++ b/dumux/freeflow/navierstokes/momentum/localresidual.hh
@@ -211,7 +211,7 @@ public:
const ElementFluxVariablesCache& elemFluxVarsCache,
const SubControlVolumeFace& scvf) const
{
- static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::fcstaggered); // TODO overload this method for different discretizations
+ static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::fcstaggered); // TODO overload this method for different discretizations
static_assert(
std::decay_t<decltype(
problem.neumann(element, fvGeometry, elemVolVars, elemFluxVarsCache, scvf)
diff --git a/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh b/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
index 8f30a4daa633502efe4a798d46cbde8770694343..094a40d484033f19eafbb91da91d6f9b12d1d5b7 100644
--- a/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
+++ b/dumux/freeflow/navierstokes/momentum/velocityreconstruction.hh
@@ -39,7 +39,7 @@ struct StaggeredVelocityReconstruction
static auto cellCenterVelocity(const VelocityHelper& getFaceVelocity,
const FVElementGeometry& fvGeometry)
{
- static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::cctpfa);
+ static_assert(FVElementGeometry::GridGeometry::discMethod == DiscretizationMethods::cctpfa);
using VelocityVector = typename FVElementGeometry::GridGeometry::GlobalCoordinate;
VelocityVector result(0.0);
diff --git a/dumux/freeflow/rans/problem.hh b/dumux/freeflow/rans/problem.hh
index 9e08345c41b2e4283ebb33773a741ddb44230a49..4f3e74346af273eeb2433b63938b3cff07327b85 100644
--- a/dumux/freeflow/rans/problem.hh
+++ b/dumux/freeflow/rans/problem.hh
@@ -414,7 +414,7 @@ private:
void storeWallElementAndDirectionIndex_(const WallData& wallData)
{
// The wall Direction Index is used for flat quadrilateral channel problems only
- if (!(GridGeometry::discMethod == DiscretizationMethod::staggered))
+ if (!(GridGeometry::discMethod == DiscretizationMethods::staggered))
DUNE_THROW(Dune::NotImplemented, "The wall direction Index can only be calculated for quadrilateral structured grids");
// If isFlatWallBounded, the corresonding wall element is stored for each element
diff --git a/dumux/geomechanics/poroelastic/couplingmanager.hh b/dumux/geomechanics/poroelastic/couplingmanager.hh
index 084df8b78b0cce60356b45d39dee77367dc8a4ae..1b6e60bb161205b0439ba39766f03b058a336d0e 100644
--- a/dumux/geomechanics/poroelastic/couplingmanager.hh
+++ b/dumux/geomechanics/poroelastic/couplingmanager.hh
@@ -79,11 +79,11 @@ class PoroMechanicsCouplingManager : public virtual CouplingManager< MDTraits >
"The grid types of the two sub-problems have to be equal!");
//! this coupling manager is for cc - box only
- static_assert(GridGeometry<PoroMechId>::discMethod == DiscretizationMethod::box,
+ static_assert(GridGeometry<PoroMechId>::discMethod == DiscretizationMethods::box,
"Poro-mechanical problem must be discretized with the box scheme for this coupling manager!");
- static_assert(GridGeometry<PMFlowId>::discMethod == DiscretizationMethod::cctpfa ||
- GridGeometry<PMFlowId>::discMethod == DiscretizationMethod::ccmpfa,
+ static_assert(GridGeometry<PMFlowId>::discMethod == DiscretizationMethods::cctpfa ||
+ GridGeometry<PMFlowId>::discMethod == DiscretizationMethods::ccmpfa,
"Porous medium flow problem must be discretized with a cell-centered scheme for this coupling manager!");
//! this does not work for enabled grid volume variables caching (update of local view in context has no effect)
diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh
index cdf9ad60c7e64a4ba4e314fdad5ced17205119c2..0a022cdc3bdb4a1bdff35ed0b59c329b65fb3a7c 100644
--- a/dumux/io/loadsolution.hh
+++ b/dumux/io/loadsolution.hh
@@ -151,7 +151,7 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
}
}
// for staggered face data (which is written out as VTK point data) we just read in the vector
- else if (dataType == VTKReader::DataType::pointData && GridGeometry::discMethod == DiscretizationMethod::staggered)
+ else if (dataType == VTKReader::DataType::pointData && GridGeometry::discMethod == DiscretizationMethods::staggered)
{
if (sol.size() != vec.size())
DUNE_THROW(Dune::InvalidStateException, "Solution size (" << sol.size() << ") does not match input size (" << vec.size() << ")!");
@@ -333,19 +333,19 @@ void loadSolution(SolutionVector& sol,
const GridGeometry& gridGeometry)
{
const auto extension = fileName.substr(fileName.find_last_of(".") + 1);
- auto dataType = GridGeometry::discMethod == DiscretizationMethod::box ?
+ auto dataType = GridGeometry::discMethod == DiscretizationMethods::box ?
VTKReader::DataType::pointData : VTKReader::DataType::cellData;
if (extension == "vtu" || extension == "vtp")
{
- if (GridGeometry::discMethod == DiscretizationMethod::staggered && extension == "vtp")
+ if (GridGeometry::discMethod == DiscretizationMethods::staggered && extension == "vtp")
dataType = VTKReader::DataType::pointData;
loadSolutionFromVtkFile(sol, fileName, targetPvNameFunc, gridGeometry, dataType);
}
else if (extension == "pvtu" || extension == "pvtp")
{
- if (GridGeometry::discMethod == DiscretizationMethod::staggered)
+ if (GridGeometry::discMethod == DiscretizationMethods::staggered)
DUNE_THROW(Dune::NotImplemented, "reading staggered solution from a parallel vtk file");
loadSolutionFromVtkFile(sol, fileName, targetPvNameFunc, gridGeometry, dataType);
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
index 30600dc5a24b9d7a1f19ead01e12326ceee09e2e..21fda6a349d8764ff435b7deb83472d47cf5e773 100644
--- a/dumux/io/vtkoutputmodule.hh
+++ b/dumux/io/vtkoutputmodule.hh
@@ -321,7 +321,7 @@ class VtkOutputModule : public VtkOutputModuleBase<typename GridVariables::GridG
using Element = typename GridView::template Codim<0>::Entity;
using VolVarsVector = Dune::FieldVector<Scalar, dimWorld>;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr int dofCodim = isBox ? dim : 0;
struct VolVarScalarDataInfo { std::function<Scalar(const VV&)> get; std::string name; Dumux::Vtk::Precision precision_; };
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 9fe071ef33330c67a8e7a3ada4f52a24a321b957..f2ef6d149a4282b8cf7fc5996f013475d6eafaec 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -75,7 +75,7 @@ class ElectroChemistry
};
using GridView = typename GridGeometry::GridView;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>;
public:
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index d4d31de82eb6e089e27a442cccfac2320c67480d..507f6532bb3c999bbcdf345a401f765e8e0fd994 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -51,7 +51,7 @@ class ElectroChemistryNI : public ElectroChemistry<Scalar, Indices, FluidSystem,
};
using GridView = typename GridGeometry::GridView;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>;
using CellVector = typename Dune::FieldVector<typename GridView::ctype, GridView::dimension>;
diff --git a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
index 6f9cf6d820910f6c4d4b06920705051c97db93e2..56b18bc5ac3191e63a6d97c033295c2d5e8e14e7 100644
--- a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
+++ b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh
@@ -74,7 +74,7 @@ class DarcyDarcyBoundaryCouplingManager
template<std::size_t i>
static constexpr bool isCCTpfa()
- { return GridGeometry<i>::discMethod == DiscretizationMethod::cctpfa; }
+ { return GridGeometry<i>::discMethod == DiscretizationMethods::cctpfa; }
using CouplingStencil = std::vector<std::size_t>;
public:
diff --git a/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh b/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh
index 527ffd0d32c2e52fe0536e33b5b1f54e060bf8f1..cbaf16b480173ee161c3f62bf6b9af5a4856e1c7 100644
--- a/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh
+++ b/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh
@@ -60,7 +60,7 @@ class DarcyDarcyBoundaryCouplingMapper
template<std::size_t i>
static constexpr bool isCCTpfa()
- { return GridGeometry<i>::discMethod == DiscretizationMethod::cctpfa; }
+ { return GridGeometry<i>::discMethod == DiscretizationMethods::cctpfa; }
struct ScvfInfo
{
diff --git a/dumux/multidomain/boundary/freeflowporousmedium/ffmomentumpm/couplingmapper.hh b/dumux/multidomain/boundary/freeflowporousmedium/ffmomentumpm/couplingmapper.hh
index 59f15ea1385dbc547c749a1c8bb77f76b9d6c162..8a5643e919919c53a687aab298e023f61869cac1 100644
--- a/dumux/multidomain/boundary/freeflowporousmedium/ffmomentumpm/couplingmapper.hh
+++ b/dumux/multidomain/boundary/freeflowporousmedium/ffmomentumpm/couplingmapper.hh
@@ -61,11 +61,11 @@ class FreeFlowMomentumPorousMediumCouplingMapper
template<std::size_t i>
static constexpr bool isFcStaggered()
- { return GridGeometry<i>::discMethod == DiscretizationMethod::fcstaggered; }
+ { return GridGeometry<i>::discMethod == DiscretizationMethods::fcstaggered; }
template<std::size_t i>
static constexpr bool isCCTpfa()
- { return GridGeometry<i>::discMethod == DiscretizationMethod::cctpfa; }
+ { return GridGeometry<i>::discMethod == DiscretizationMethods::cctpfa; }
struct ScvfInfoPM
{
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
index 680e1bba6fea04c281ae1afda5ab768fed68b41a..1d38fbbdf887c5b95fefa614b45fc0b82e665927 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
@@ -62,10 +62,10 @@ public:
const auto& stokesFvGridGeometry = couplingManager.problem(CouplingManager::stokesIdx).gridGeometry();
const auto& darcyFvGridGeometry = couplingManager.problem(CouplingManager::darcyIdx).gridGeometry();
- static_assert(std::decay_t<decltype(stokesFvGridGeometry)>::discMethod == DiscretizationMethod::staggered,
+ static_assert(std::decay_t<decltype(stokesFvGridGeometry)>::discMethod == DiscretizationMethods::staggered,
"The free flow domain must use the staggered discretization");
- static_assert(std::decay_t<decltype(darcyFvGridGeometry)>::discMethod == DiscretizationMethod::cctpfa,
+ static_assert(std::decay_t<decltype(darcyFvGridGeometry)>::discMethod == DiscretizationMethods::cctpfa,
"The Darcy domain must use the CCTpfa discretization");
isCoupledDarcyScvf_.resize(darcyFvGridGeometry.numScvf(), false);
diff --git a/dumux/multidomain/couplingjacobianpattern.hh b/dumux/multidomain/couplingjacobianpattern.hh
index 51d6291255364c10daaefaa91773c0a4410fe0b3..ce4e654f4a7722964a2ae0468b8bd2ed87c30ef5 100644
--- a/dumux/multidomain/couplingjacobianpattern.hh
+++ b/dumux/multidomain/couplingjacobianpattern.hh
@@ -37,8 +37,8 @@ namespace Dumux {
* for cell-centered schemes
*/
template<bool isImplicit, class CouplingManager, class GridGeometryI, class GridGeometryJ, std::size_t i, std::size_t j,
- typename std::enable_if_t<( (GridGeometryI::discMethod == DiscretizationMethod::cctpfa)
- || (GridGeometryI::discMethod == DiscretizationMethod::ccmpfa) ), int> = 0>
+ typename std::enable_if_t<( (GridGeometryI::discMethod == DiscretizationMethods::cctpfa)
+ || (GridGeometryI::discMethod == DiscretizationMethods::ccmpfa) ), int> = 0>
Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingManager,
Dune::index_constant<i> domainI,
const GridGeometryI& gridGeometryI,
@@ -75,7 +75,7 @@ Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingM
* for the box scheme
*/
template<bool isImplicit, class CouplingManager, class GridGeometryI, class GridGeometryJ, std::size_t i, std::size_t j,
- typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethod::box), int> = 0>
+ typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethods::box), int> = 0>
Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingManager,
Dune::index_constant<i> domainI,
const GridGeometryI& gridGeometryI,
@@ -116,7 +116,7 @@ Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingM
* for the staggered scheme (degrees of freedom on cell centers)
*/
template<bool isImplicit, class CouplingManager, class GridGeometryI, class GridGeometryJ, std::size_t i, std::size_t j,
- typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethod::staggered &&
+ typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethods::staggered &&
GridGeometryI::isCellCenter()), int> = 0>
Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingManager,
Dune::index_constant<i> domainI,
@@ -142,7 +142,7 @@ Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingM
* for the staggered scheme (degrees of freedom on faces)
*/
template<bool isImplicit, class CouplingManager, class GridGeometryI, class GridGeometryJ, std::size_t i, std::size_t j,
- typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethod::staggered &&
+ typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethods::staggered &&
GridGeometryI::isFace()), int> = 0>
Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingManager,
Dune::index_constant<i> domainI,
@@ -175,7 +175,7 @@ Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingM
* for the staggered scheme (degrees of freedom on cell centers)
*/
template<bool isImplicit, class CouplingManager, class GridGeometryI, class GridGeometryJ, std::size_t i, std::size_t j,
- typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethod::fcstaggered), int> = 0>
+ typename std::enable_if_t<(GridGeometryI::discMethod == DiscretizationMethods::fcstaggered), int> = 0>
Dune::MatrixIndexSet getCouplingJacobianPattern(const CouplingManager& couplingManager,
Dune::index_constant<i> domainI,
const GridGeometryI& gridGeometryI,
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_average.hh b/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
index 26b61fd4cba0ef9c988072989e47bde28463eb7d..3592983e95b8a0c4cb854d663af85017f4fbfa0d 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_average.hh
@@ -87,7 +87,7 @@ class Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Average>
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
public:
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh b/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
index d64de37a39e23bb58d6dcc7d185ad35d3b2c4b5c..ab52f2d373c3a9770ba2c72159d33fe91c302ebe 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_kernel.hh
@@ -85,7 +85,7 @@ class Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Kernel>
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
static_assert(!isBox<bulkIdx>() && !isBox<lowDimIdx>(), "The kernel coupling method is only implemented for the tpfa method");
static_assert(Dune::Capabilities::isCartesian<typename GridView<bulkIdx>::Grid>::v, "The kernel coupling method is only implemented for structured grids");
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh b/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
index 315bd0690f16e3c96fea79574cf1f2b90dda3d9d..d3eebf86525ee86d4f04ffae0602a837f35e0d1d 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_projection.hh
@@ -355,7 +355,7 @@ class Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Projection
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
using GlobalPosition = typename Element<bulkIdx>::Geometry::GlobalCoordinate;
diff --git a/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh b/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
index dc8de7fbcb4b443d6a78c0d98252672cec1ef04a..78aa3f0db00d069930c6c7be4a79a2116e72e3e5 100644
--- a/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
+++ b/dumux/multidomain/embedded/couplingmanager1d3d_surface.hh
@@ -86,7 +86,7 @@ class Embedded1d3dCouplingManager<MDTraits, Embedded1d3dCouplingMode::Surface>
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
enum {
bulkDim = GridView<bulkIdx>::dimension,
diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh
index b1cd9c4b723764465e17ee62bc85f5f405623203..a8c9d7e5dae5ab866fd5f4bbcf8e5bae372fc2d3 100644
--- a/dumux/multidomain/embedded/couplingmanagerbase.hh
+++ b/dumux/multidomain/embedded/couplingmanagerbase.hh
@@ -102,7 +102,7 @@ class EmbeddedCouplingManagerBase
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
using GlobalPosition = typename Element<bulkIdx>::Geometry::GlobalCoordinate;
using GlueType = MultiDomainGlue<GridView<bulkIdx>, GridView<lowDimIdx>, ElementMapper<bulkIdx>, ElementMapper<lowDimIdx>>;
@@ -463,7 +463,7 @@ protected:
template<std::size_t i, class FVGG, class Geometry, class ShapeValues>
void getShapeValues(Dune::index_constant<i> domainI, const FVGG& gridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues)
{
- if constexpr (FVGG::discMethod == DiscretizationMethod::box)
+ if constexpr (FVGG::discMethod == DiscretizationMethods::box)
{
const auto ipLocal = geo.local(globalPos);
const auto& localBasis = this->problem(domainI).gridGeometry().feCache().get(geo.type()).localBasis();
diff --git a/dumux/multidomain/embedded/extendedsourcestencil.hh b/dumux/multidomain/embedded/extendedsourcestencil.hh
index 6a80947f99f4af397a876f36be46cdfef73536e6..1ee46bddc017dfcabd126d29c45994d32b65eaf6 100644
--- a/dumux/multidomain/embedded/extendedsourcestencil.hh
+++ b/dumux/multidomain/embedded/extendedsourcestencil.hh
@@ -57,7 +57,7 @@ class ExtendedSourceStencil
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
public:
/*!
* \brief extend the jacobian pattern of the diagonal block of domain i
diff --git a/dumux/multidomain/embedded/integrationpointsource.hh b/dumux/multidomain/embedded/integrationpointsource.hh
index 4a8793077963d130a9bbe3e4988d4d5093929898..eb29423a918185483c05d3765b6251a06ef19442 100644
--- a/dumux/multidomain/embedded/integrationpointsource.hh
+++ b/dumux/multidomain/embedded/integrationpointsource.hh
@@ -123,7 +123,7 @@ public:
{
// get the index of the element in which the point source falls
const auto eIdx = source.elementIndex();
- if constexpr (GridGeometry::discMethod == DiscretizationMethod::box)
+ if constexpr (GridGeometry::discMethod == DiscretizationMethods::box)
{
auto fvGeometry = localView(gridGeometry);
// check in which subcontrolvolume(s) we are
diff --git a/dumux/multidomain/embedded/pointsourcedata.hh b/dumux/multidomain/embedded/pointsourcedata.hh
index d6cbab29645e1b3d5ef5b44645309c76a9820c3f..e3a85dbe40f7b5c2d649fb28da44736bb1896c3d 100644
--- a/dumux/multidomain/embedded/pointsourcedata.hh
+++ b/dumux/multidomain/embedded/pointsourcedata.hh
@@ -56,7 +56,7 @@ class PointSourceData
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
public:
void addBulkInterpolation(const ShapeValues& shapeValues,
@@ -165,7 +165,7 @@ class PointSourceDataCircleAverage : public PointSourceData<MDTraits>
template<std::size_t id>
static constexpr bool isBox()
- { return GridGeometry<id>::discMethod == DiscretizationMethod::box; }
+ { return GridGeometry<id>::discMethod == DiscretizationMethods::box; }
public:
PointSourceDataCircleAverage() : enableBulkCircleInterpolation_(false) {}
diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh
index 58b8b15d54b5e2620a84c1ab6692dd18cfbb2e1d..0f8066ad726cbb187ff2db62aba0a7f5276d4d56 100644
--- a/dumux/multidomain/facet/box/couplingmanager.hh
+++ b/dumux/multidomain/facet/box/couplingmanager.hh
@@ -90,7 +90,7 @@ class FacetCouplingManager<MDTraits, CouplingMapper, bulkDomainId, lowDimDomainI
static constexpr auto bulkGridId = CouplingMapper::template gridId<bulkDim>();
static constexpr auto lowDimGridId = CouplingMapper::template gridId<lowDimDim>();
- static constexpr bool lowDimUsesBox = GridGeometry<lowDimId>::discMethod == DiscretizationMethod::box;
+ static constexpr bool lowDimUsesBox = GridGeometry<lowDimId>::discMethod == DiscretizationMethods::box;
/*!
* \brief The coupling context of the bulk domain. Contains all data of the lower-
diff --git a/dumux/multidomain/fvassembler.hh b/dumux/multidomain/fvassembler.hh
index 8f88cc3d37a348de7ff8b82ce24e6a0f5fc9b381..873c803e937193b3e472032e431f0aa3274570b3 100644
--- a/dumux/multidomain/fvassembler.hh
+++ b/dumux/multidomain/fvassembler.hh
@@ -253,7 +253,7 @@ public:
if (gridView.comm().size() > 1 && gridView.overlapSize(0) == 0)
{
- if constexpr (GridGeometry<domainId>::discMethod == DiscretizationMethod::box)
+ if constexpr (GridGeometry<domainId>::discMethod == DiscretizationMethods::box)
{
using GV = typename GridGeometry<domainId>::GridView;
using DM = typename GridGeometry<domainId>::VertexMapper;
@@ -558,7 +558,7 @@ private:
template<std::size_t i, class JacRow, class Sol, class GG>
void enforcePeriodicConstraints_(Dune::index_constant<i> domainI, JacRow& jacRow, Sol& res, const GG& gridGeometry, const Sol& curSol)
{
- if constexpr (GG::discMethod == DiscretizationMethod::box || GG::discMethod == DiscretizationMethod::fcstaggered)
+ if constexpr (GG::discMethod == DiscretizationMethods::box || GG::discMethod == DiscretizationMethods::fcstaggered)
{
for (const auto& m : gridGeometry.periodicVertexMap())
{
diff --git a/dumux/multidomain/staggeredcouplingmanager.hh b/dumux/multidomain/staggeredcouplingmanager.hh
index 87bc571b011835cfa07ef6d4210e55f3e69f993d..3bb5fefddee8cb7ee5300a8a334da78b9078b4e4 100644
--- a/dumux/multidomain/staggeredcouplingmanager.hh
+++ b/dumux/multidomain/staggeredcouplingmanager.hh
@@ -186,7 +186,7 @@ public:
* \brief return the numeric epsilon used for deflecting primary variables of coupled domain i.
* \note specialization for non-staggered schemes
*/
- template<std::size_t i, typename std::enable_if_t<(GridGeometry<i>::discMethod != DiscretizationMethod::staggered), int> = 0>
+ template<std::size_t i, typename std::enable_if_t<(GridGeometry<i>::discMethod != DiscretizationMethods::staggered), int> = 0>
decltype(auto) numericEpsilon(Dune::index_constant<i> id,
const std::string& paramGroup) const
{
@@ -197,7 +197,7 @@ public:
* \brief return the numeric epsilon used for deflecting primary variables of coupled domain i.
* \note specialization for non-staggered schemes
*/
- template<std::size_t i, typename std::enable_if_t<(GridGeometry<i>::discMethod == DiscretizationMethod::staggered), int> = 0>
+ template<std::size_t i, typename std::enable_if_t<(GridGeometry<i>::discMethod == DiscretizationMethods::staggered), int> = 0>
decltype(auto) numericEpsilon(Dune::index_constant<i>,
const std::string& paramGroup) const
{
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index cadf82de45baa1cb862b1d1768bf5ccb8c54bcd3..960446bfeef54f2d2921f3e2fcf6fd34aa766ee5 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -57,7 +57,7 @@ class NewtonConvergenceWriter : public ConvergenceWriterInterface<SolutionVector
static constexpr auto numEq = SolutionVector::block_type::dimension;
using Scalar = typename SolutionVector::block_type::value_type;
- static_assert(GridGeometry::discMethod != DiscretizationMethod::staggered,
+ static_assert(GridGeometry::discMethod != DiscretizationMethods::staggered,
"This convergence writer does not work for the staggered method, use the StaggeredNewtonConvergenceWriter instead");
public:
/*!
@@ -72,7 +72,7 @@ public:
{
resize();
- if (GridGeometry::discMethod == DiscretizationMethod::box)
+ if (GridGeometry::discMethod == DiscretizationMethods::box)
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
{
diff --git a/dumux/nonlinear/staggerednewtonconvergencewriter.hh b/dumux/nonlinear/staggerednewtonconvergencewriter.hh
index 251a6d53799180b522c930d120b0ad87b2cdff52..2e85f987e45c899e53ae8e7166848aa746cd145f 100644
--- a/dumux/nonlinear/staggerednewtonconvergencewriter.hh
+++ b/dumux/nonlinear/staggerednewtonconvergencewriter.hh
@@ -59,7 +59,7 @@ class StaggeredNewtonConvergenceWriter : public ConvergenceWriterInterface<Solut
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- static_assert(GridGeometry::discMethod == DiscretizationMethod::staggered,
+ static_assert(GridGeometry::discMethod == DiscretizationMethods::staggered,
"This convergence writer does only work for the staggered method, use the NewtonConvergenceWriter instead");
public:
/*!
diff --git a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
index 184fffe06813e17520a0dcb73076d3d5785f5255..58b8295958afde26185c56e05780bc0b40b154f1 100644
--- a/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
+++ b/dumux/porousmediumflow/1p/incompressiblelocalresidual.hh
@@ -84,7 +84,7 @@ public:
//! Flux derivatives for the cell-centered tpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::cctpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::cctpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -137,7 +137,7 @@ public:
//! Flux derivatives for the cell-centered mpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::ccmpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::ccmpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -174,7 +174,7 @@ public:
//! Flux derivatives for the box scheme
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
@@ -212,7 +212,7 @@ public:
//! Dirichlet flux derivatives for the cell-centered tpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::cctpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::cctpfa, void>
addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -232,7 +232,7 @@ public:
//! Dirichlet flux derivatives for the cell-centered mpfa scheme
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::ccmpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::ccmpfa, void>
addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/2p/boxmaterialinterfaces.hh b/dumux/porousmediumflow/2p/boxmaterialinterfaces.hh
index ea021f19ba860dfaa0d9ec2734cb494d718effbb..69a75ce3d035e208c7e9b590bc6a995844bc370c 100644
--- a/dumux/porousmediumflow/2p/boxmaterialinterfaces.hh
+++ b/dumux/porousmediumflow/2p/boxmaterialinterfaces.hh
@@ -69,7 +69,7 @@ public:
const SolutionVector& x)
{
// make sure this is only called for geometries of the box method!
- if (GridGeometry::discMethod != DiscretizationMethod::box)
+ if (GridGeometry::discMethod != DiscretizationMethods::box)
DUNE_THROW(Dune::InvalidStateException, "Determination of the interface material parameters with "
"this class only makes sense when using the box method!");
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index ae38682188dea2c2e816764e04b568250895c59d..7dc206f8d1a33eae397d99a10e8818c66085eaca 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -81,7 +81,7 @@ class TwoPGridDataTransfer : public GridDataTransfer<GetPropType<TypeTag, Proper
static constexpr int dim = Grid::dimension;
static constexpr int dimWorld = Grid::dimensionworld;
- static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box;
// saturation primary variable index
enum { saturationIdx = Indices::saturationIdx };
diff --git a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
index 66fa5b3f791c645d553c8505ae6f2e5d66a9b8f2..659f70db00b9683a9a079163604771b5efbaf0f9 100644
--- a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
+++ b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh
@@ -147,7 +147,7 @@ public:
* \param scvf The sub control volume face
*/
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::cctpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::cctpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -266,7 +266,7 @@ public:
* \param scvf The sub control volume face
*/
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
index d4b527da95f66d8e51d52b8cc2d2b59962ed4293..a7efead19c21154a3d7fa725c77493589be15ddd 100644
--- a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
+++ b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
@@ -80,7 +80,7 @@ class BoxDfmVtkOutputModule : public VtkOutputModule<GridVariables, SolutionVect
static_assert(dim > 1, "Box-Dfm output only works for dim > 1");
static_assert(FractureGrid::dimension == int(dim-1), "Fracture grid must be of codimension one!");
static_assert(FractureGrid::dimensionworld == int(dimWorld), "Fracture grid has to has the same coordinate dimension!");
- static_assert(GridGeometry::discMethod == DiscretizationMethod::box, "Box-Dfm output module can only be used with the box scheme!");
+ static_assert(GridGeometry::discMethod == DiscretizationMethods::box, "Box-Dfm output module can only be used with the box scheme!");
public:
//! The constructor
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 2af0fbf74956dc831b285bc0ccc0247ac6ff6870..5049349d11d3bda3f511d9e4703ba31d7148aad4 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -184,7 +184,7 @@ public:
const SolutionVector& sol)
{
if constexpr (GridVariables::GridFluxVariablesCache::cachingEnabled
- && GridVariables::GridGeometry::discMethod != DiscretizationMethod::box)
+ && GridVariables::GridGeometry::discMethod != DiscretizationMethods::box)
{
// update the flux variables if global caching is enabled
const auto dofIdxGlobal = gridGeometry.dofMapper().index(element);
@@ -210,7 +210,7 @@ public:
GridVariables& gridVariables,
SolutionVector& sol)
{
- if constexpr (GridVariables::GridGeometry::discMethod == DiscretizationMethod::box || Problem::enableInternalDirichletConstraints())
+ if constexpr (GridVariables::GridGeometry::discMethod == DiscretizationMethods::box || Problem::enableInternalDirichletConstraints())
{
std::vector<bool> stateChanged(sol.size(), false);
std::size_t countChanged = 0;
@@ -232,7 +232,7 @@ public:
if (stateChanged[dofIdx])
continue;
- if constexpr (GridVariables::GridGeometry::discMethod == DiscretizationMethod::box)
+ if constexpr (GridVariables::GridGeometry::discMethod == DiscretizationMethods::box)
{
if (gridGeometry.dofOnBoundary(dofIdx))
{
@@ -328,7 +328,7 @@ protected:
const Problem& problem)
{
// Dofs can be only constrained when using the Box method or when imposing internal Dirichlet constraints
- if constexpr (Geometry::GridGeometry::discMethod != DiscretizationMethod::box && !Problem::enableInternalDirichletConstraints())
+ if constexpr (Geometry::GridGeometry::discMethod != DiscretizationMethods::box && !Problem::enableInternalDirichletConstraints())
return false;
// check for internally constrained Dofs
@@ -347,7 +347,7 @@ protected:
return true;
// check for a Dirichlet BC when using the Box method
- if constexpr (Geometry::GridGeometry::discMethod == DiscretizationMethod::box)
+ if constexpr (Geometry::GridGeometry::discMethod == DiscretizationMethods::box)
{
if (!fvGeometry.hasBoundaryScvf())
return false;
diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh
index 16948db4d1ef555df090d8917c047fc33b5dd3cf..0c220608e8e805bf01a218c26159868a5d18c37a 100644
--- a/dumux/porousmediumflow/fluxvariablescachefiller.hh
+++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh
@@ -531,7 +531,7 @@ private:
if constexpr (advectionEnabled)
{
using AdvectionType = GetPropType<TypeTag, Properties::AdvectionType>;
- if constexpr (AdvectionType::discMethod == DiscretizationMethod::ccmpfa)
+ if constexpr (AdvectionType::discMethod == DiscretizationMethods::ccmpfa)
prepareAdvectionHandle_(iv, handle, forceUpdate);
}
@@ -539,7 +539,7 @@ private:
if constexpr (diffusionEnabled)
{
using DiffusionType = GetPropType<TypeTag, Properties::MolecularDiffusionType>;
- if constexpr (DiffusionType::discMethod == DiscretizationMethod::ccmpfa)
+ if constexpr (DiffusionType::discMethod == DiscretizationMethods::ccmpfa)
prepareDiffusionHandles_(iv, handle, forceUpdate);
}
@@ -547,7 +547,7 @@ private:
if constexpr (heatConductionEnabled)
{
using HeatConductionType = GetPropType<TypeTag, Properties::HeatConductionType>;
- if constexpr (HeatConductionType::discMethod == DiscretizationMethod::ccmpfa)
+ if constexpr (HeatConductionType::discMethod == DiscretizationMethods::ccmpfa)
prepareHeatConductionHandle_(iv, handle, forceUpdate);
}
}
diff --git a/dumux/porousmediumflow/nonequilibrium/gridvariables.hh b/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
index d73498b836465b715b5e5e86177efe596ee8dabf..0d469d9337718c34751c3fb3e6b7078b7c55a468 100644
--- a/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
+++ b/dumux/porousmediumflow/nonequilibrium/gridvariables.hh
@@ -58,7 +58,7 @@ class NonEquilibriumGridVariables
static constexpr auto dim = ParentType::GridGeometry::GridView::dimension; // Grid and world dimension
static constexpr auto dimWorld = ParentType::GridGeometry::GridView::dimensionworld;
static constexpr int numPhases = ParentType::VolumeVariables::numFluidPhases();
- static constexpr bool isBox = ParentType::GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = ParentType::GridGeometry::discMethod == DiscretizationMethods::box;
public:
//! Export the type used for scalar values
diff --git a/dumux/porousmediumflow/richards/localresidual.hh b/dumux/porousmediumflow/richards/localresidual.hh
index 6e8302f553f88f0723ee5c7830129d055b4d9da3..8f8b691c28cc7faaf19aacf6782a850faef3fb72 100644
--- a/dumux/porousmediumflow/richards/localresidual.hh
+++ b/dumux/porousmediumflow/richards/localresidual.hh
@@ -254,7 +254,7 @@ public:
* \param scvf The sub control volume face
*/
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::cctpfa, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::cctpfa, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -330,7 +330,7 @@ public:
* \param scvf The sub control volume face
*/
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/tracer/localresidual.hh b/dumux/porousmediumflow/tracer/localresidual.hh
index 717401ec70ed2f19bcb24d53b3b37fd151ff732e..dd4d416378b5e0daec4ca0a909c2c427e3b20ed9 100644
--- a/dumux/porousmediumflow/tracer/localresidual.hh
+++ b/dumux/porousmediumflow/tracer/localresidual.hh
@@ -237,7 +237,7 @@ public:
}
template<class PartialDerivativeMatrices, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod != DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod != DiscretizationMethods::box, void>
addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
const Problem& problem,
const Element& element,
@@ -246,7 +246,7 @@ public:
const ElementFluxVariablesCache& elemFluxVarsCache,
const SubControlVolumeFace& scvf) const
{
- if constexpr (FVElementGeometry::GridGeometry::discMethod != DiscretizationMethod::cctpfa)
+ if constexpr (FVElementGeometry::GridGeometry::discMethod != DiscretizationMethods::cctpfa)
DUNE_THROW(Dune::NotImplemented, "Analytic flux differentiation only implemented for tpfa");
// advective term: we do the same for all tracer components
@@ -299,7 +299,7 @@ public:
}
template<class JacobianMatrix, class T = TypeTag>
- std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethod::box, void>
+ std::enable_if_t<GetPropType<T, Properties::GridGeometry>::discMethod == DiscretizationMethods::box, void>
addFluxDerivatives(JacobianMatrix& A,
const Problem& problem,
const Element& element,
diff --git a/dumux/porousmediumflow/velocity.hh b/dumux/porousmediumflow/velocity.hh
index 86ed6728f9f3b3902f38fa535999ac87a4738b87..5b91e765de619f5aef60532a098b3404760cd235 100644
--- a/dumux/porousmediumflow/velocity.hh
+++ b/dumux/porousmediumflow/velocity.hh
@@ -85,7 +85,7 @@ class PorousMediumFlowVelocity
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr int dofCodim = isBox ? dim : 0;
static constexpr bool stationaryVelocityField = FluxTraits::hasStationaryVelocityField();
@@ -234,7 +234,7 @@ public:
// For the number of scvfs per facet (mpfa) we simply obtain the number of
// corners of the first facet as prisms/pyramids are not supported here anyway
// -> for prisms/pyramids the number of scvfs would differ from facet to facet
- static constexpr bool isMpfa = GridGeometry::discMethod == DiscretizationMethod::ccmpfa;
+ static constexpr bool isMpfa = GridGeometry::discMethod == DiscretizationMethods::ccmpfa;
const int numScvfsPerFace = isMpfa ? element.template subEntity<1>(0).geometry().corners() : 1;
if (fvGeometry.numScvf() != element.subEntities(1)*numScvfsPerFace)
diff --git a/dumux/porousmediumflow/velocityoutput.hh b/dumux/porousmediumflow/velocityoutput.hh
index a3319b14e86f0fb8e25b5c0f1c9ac086487f39d3..161ea07c337124f933065e31322b0708b9cc8d88 100644
--- a/dumux/porousmediumflow/velocityoutput.hh
+++ b/dumux/porousmediumflow/velocityoutput.hh
@@ -59,7 +59,7 @@ class PorousMediumFlowVelocityOutput : public VelocityOutput<GridVariables>
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr int dofCodim = isBox ? dim : 0;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
diff --git a/dumux/python/common/fvproblem.hh b/dumux/python/common/fvproblem.hh
index 21e6904314289d94844d44cfc21ef630f9b54422..86eb699bc1375c887dc0975f9e23e8bcb2100c70 100644
--- a/dumux/python/common/fvproblem.hh
+++ b/dumux/python/common/fvproblem.hh
@@ -55,7 +55,7 @@ public:
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr std::size_t numEq = static_cast<std::size_t>(PrimaryVariables::dimension);
using BoundaryTypes = Dumux::BoundaryTypes<PrimaryVariables::dimension>;
diff --git a/dumux/python/porousmediumflow/problem.hh b/dumux/python/porousmediumflow/problem.hh
index 30c72f3b405c489559dc6d940f453f5c24cf2061..245bf11a9c3afb68a0482cbc9cb84fb8664c40ad 100644
--- a/dumux/python/porousmediumflow/problem.hh
+++ b/dumux/python/porousmediumflow/problem.hh
@@ -51,7 +51,7 @@ public:
using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr std::size_t numEq = static_cast<std::size_t>(PrimaryVariables::dimension);
using BoundaryTypes = Dumux::BoundaryTypes<PrimaryVariables::dimension>;
diff --git a/test/multidomain/facet/1p_1p/analytical/main.cc b/test/multidomain/facet/1p_1p/analytical/main.cc
index 469735bbafe1a2c279e71c4e127d6080fbefb85f..e242b4967f123caacf424a63016386aadbaca279 100644
--- a/test/multidomain/facet/1p_1p/analytical/main.cc
+++ b/test/multidomain/facet/1p_1p/analytical/main.cc
@@ -133,7 +133,7 @@ auto makeBulkFVGridGeometry(const GridManager& gridManager,
* we have to create additional faces on interior boundaries, which are not
* created in the standard scheme.
*/
- if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethod::box)
+ if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethods::box)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
@@ -233,7 +233,7 @@ int main(int argc, char** argv)
lowDimGridVariables->init(x[lowDimId]);
// intialize the vtk output modulell
- const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethod::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
+ const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk", bulkDM);
@@ -257,7 +257,7 @@ int main(int argc, char** argv)
for (const auto& element : elements(bulkFvGridGeometry->gridView()))
{
- if (BulkFVGridGeometry::discMethod == DiscretizationMethod::box)
+ if (BulkFVGridGeometry::discMethod == DiscretizationMethods::box)
for (int i = 0; i < element.geometry().corners(); ++i)
bulkExact[ bulkFvGridGeometry->vertexMapper().subIndex(element, i, BulkGrid::dimension) ]
= bulkProblem->exact( element.template subEntity<BulkGrid::dimension>(i).geometry().center() );
@@ -267,7 +267,7 @@ int main(int argc, char** argv)
for (const auto& element : elements(lowDimFvGridGeometry->gridView()))
{
- if (LowDimFVGridGeometry::discMethod == DiscretizationMethod::box)
+ if (LowDimFVGridGeometry::discMethod == DiscretizationMethods::box)
for (int i = 0; i < element.geometry().corners(); ++i)
lowDimExact[ lowDimFvGridGeometry->vertexMapper().subIndex(element, i, LowDimGrid::dimension) ]
= lowDimProblem->exact( element.template subEntity<LowDimGrid::dimension>(i).geometry().center() );
diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc
index 054d80c01879feb794618e2065ad404c9a041fd3..90d5bab4af6f6a6fcd85bd55faee523af27ec201 100644
--- a/test/multidomain/facet/1p_1p/threedomain/main.cc
+++ b/test/multidomain/facet/1p_1p/threedomain/main.cc
@@ -59,7 +59,7 @@ namespace Dumux {
template< class GridGeometry,
class GridManager,
class LowDimGridView,
- std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::box, int> = 0 >
+ std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethods::box, int> = 0 >
void updateFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
@@ -76,7 +76,7 @@ void updateFVGridGeometry(GridGeometry& gridGeometry,
template< class GridGeometry,
class GridManager,
class LowDimGridView,
- std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::box, int> = 0 >
+ std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethods::box, int> = 0 >
void updateFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
diff --git a/test/multidomain/facet/1pnc_1pnc/main.cc b/test/multidomain/facet/1pnc_1pnc/main.cc
index ef93d5c5603520881e93524e9e75e7ad57b4b626..fd905ba855adc00b939acde55def1ba4cc33f527 100644
--- a/test/multidomain/facet/1pnc_1pnc/main.cc
+++ b/test/multidomain/facet/1pnc_1pnc/main.cc
@@ -63,7 +63,7 @@ auto makeBulkFVGridGeometry(const GridManager& gridManager,
* we have to create additional faces on interior boundaries, which are not
* created in the standard scheme.
*/
- if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethod::box)
+ if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethods::box)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
diff --git a/test/multidomain/facet/test_facetcouplingmapper.cc b/test/multidomain/facet/test_facetcouplingmapper.cc
index 7da8cae385a9b8417ff23f38b10ed412ed9fc16a..9ff55156a135fd534201303c9e090f628b561e22 100644
--- a/test/multidomain/facet/test_facetcouplingmapper.cc
+++ b/test/multidomain/facet/test_facetcouplingmapper.cc
@@ -113,7 +113,7 @@ auto makeBulkFVGridGeometry(const GridManager& gridManager,
* we have to create additional faces on interior boundaries, which are not
* created in the standard scheme.
*/
- if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethod::box)
+ if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethods::box)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
@@ -226,7 +226,7 @@ int main (int argc, char *argv[])
const auto lowDimElemDofIndices = [&] ()
{
std::vector< typename FacetGridView::IndexSet::IndexType > dofIndices;
- if (FacetFVGridGeometry::discMethod == Dumux::DiscretizationMethod::cctpfa)
+ if (FacetFVGridGeometry::discMethod == Dumux::DiscretizationMethods::cctpfa)
dofIndices.push_back(lowDimElemIdx);
else
for (int i = 0; i < lowDimGeom.corners(); ++i)
diff --git a/test/multidomain/facet/tracer_tracer/main.cc b/test/multidomain/facet/tracer_tracer/main.cc
index 2e3b863e5b64827e2af0c196efe4f6ad978ba7e7..e64f9e1b5c1c5fda177ab2cdc3dc7e044b4f9cbc 100644
--- a/test/multidomain/facet/tracer_tracer/main.cc
+++ b/test/multidomain/facet/tracer_tracer/main.cc
@@ -68,7 +68,7 @@ auto makeBulkFVGridGeometry(const GridManager& gridManager,
* we have to create additional faces on interior boundaries, which are not
* created in the standard scheme.
*/
- if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethod::box)
+ if constexpr (BulkGridGeometry::discMethod == Dumux::DiscretizationMethods::box)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
@@ -91,7 +91,7 @@ void computeVolumeFluxes(Storage& volumeFluxes,
const Sol& sol,
Dune::index_constant<id> domainId)
{
- static constexpr bool isBox = GV::GridGeometry::discMethod == Dumux::DiscretizationMethod::box;
+ static constexpr bool isBox = GV::GridGeometry::discMethod == Dumux::DiscretizationMethods::box;
// resize depending on the scheme
if (!isBox) volumeFluxes.assign(gridGeometry.numScvf(), {0.0});
@@ -242,7 +242,7 @@ int main(int argc, char** argv)
lowDimGridVariables->init(x[lowDimId]);
// intialize the vtk output module
- const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethod::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
+ const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk.OneP", bulkDM);
@@ -336,7 +336,7 @@ int main(int argc, char** argv)
lowDimGridVariables->init(x[lowDimId]);
// intialize the vtk output modules
- const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethod::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
+ const auto bulkDM = BulkFVGridGeometry::discMethod == DiscretizationMethods::box ? Dune::VTK::nonconforming : Dune::VTK::conforming;
using BulkSolutionVector = std::decay_t<decltype(x[bulkId])>;
using LowDimSolutionVector = std::decay_t<decltype(x[lowDimId])>;
VtkOutputModule<BulkGridVariables, BulkSolutionVector> bulkVtkWriter(*bulkGridVariables, x[bulkId], bulkProblem->name(), "Bulk.Tracer", bulkDM);
diff --git a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
index a1472f565e024e293dbf2235a2adb08fccbc991e..7a19e008fe55bcc835c9087a4356e9ed2646b8f2 100644
--- a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
+++ b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
@@ -47,7 +47,7 @@ class TracerSpatialParams
using ParentType = FVSpatialParamsOneP<GridGeometry, Scalar,
TracerSpatialParams<GridGeometry, Scalar>>;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
static constexpr int dimWorld = GridView::dimensionworld;
using GlobalPosition = typename Dune::FieldVector<Scalar, dimWorld>;
diff --git a/test/porousmediumflow/1p/convergence/discretesolution/main.cc b/test/porousmediumflow/1p/convergence/discretesolution/main.cc
index 0205eedb6881eb204d547c8b4e8426ab606c32c8..d3a77e7e13d8486c2563ebd35ebeeb41b7dbc788 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/main.cc
+++ b/test/porousmediumflow/1p/convergence/discretesolution/main.cc
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
using namespace Dumux;
using TypeTag = Properties::TTag::TYPETAG;
static constexpr auto dm = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
- static constexpr bool isBox = dm == DiscretizationMethod::box;
+ static constexpr bool isBox = dm == DiscretizationMethods::box;
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/porousmediumflow/1p/incompressible/main.cc b/test/porousmediumflow/1p/incompressible/main.cc
index 90a767ad9311a718fe80b17f4317d27292e66c6d..111dc5a7bf4719b40e3eeace8f7e419184d815f8 100644
--- a/test/porousmediumflow/1p/incompressible/main.cc
+++ b/test/porousmediumflow/1p/incompressible/main.cc
@@ -54,7 +54,7 @@
//! Function to write out the scv-wise velocities (overload for mpfa)
template<class GridGeometry, class GridVariables, class Sol,
- std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::ccmpfa, int> = 0>
+ std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethods::ccmpfa, int> = 0>
void writeMpfaVelocities(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const Sol& x)
@@ -70,7 +70,7 @@ void writeMpfaVelocities(const GridGeometry& gridGeometry,
//! Function to write out the scv-wise velocities (overload for NOT mpfa)
template<class GridGeometry, class GridVariables, class Sol,
- std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::ccmpfa, int> = 0>
+ std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethods::ccmpfa, int> = 0>
void writeMpfaVelocities(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const Sol& x)
@@ -161,7 +161,7 @@ int main(int argc, char** argv)
using VelocityVector = typename VelocityOutput::VelocityVector;
VelocityVector velocity;
- constexpr bool isBox = GridGeometry::discMethod == Dumux::DiscretizationMethod::box;
+ constexpr bool isBox = GridGeometry::discMethod == Dumux::DiscretizationMethods::box;
constexpr int dimWorld = GridGeometry::GridView::dimensionworld;
const auto numCells = leafGridView.size(0);
const auto numDofs = gridGeometry->numDofs();
diff --git a/test/porousmediumflow/1p/network1d3d/problem.hh b/test/porousmediumflow/1p/network1d3d/problem.hh
index 0a84bb476efa7d4795e7276d1a7b88b817950c06..379fe54ca4eb11a9603fe3c1bf121937ac822681 100644
--- a/test/porousmediumflow/1p/network1d3d/problem.hh
+++ b/test/porousmediumflow/1p/network1d3d/problem.hh
@@ -73,7 +73,7 @@ class TubesTestProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- enum { isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box };
+ enum { isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box };
public:
TubesTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
diff --git a/test/porousmediumflow/1p/nonisothermal/main.cc b/test/porousmediumflow/1p/nonisothermal/main.cc
index 74b658e8b880e210a1a5fe0bb9ff7d3cad759f04..509764ae409c481887dc2763c6e734c36067cdd2 100644
--- a/test/porousmediumflow/1p/nonisothermal/main.cc
+++ b/test/porousmediumflow/1p/nonisothermal/main.cc
@@ -112,7 +112,7 @@ int main(int argc, char** argv)
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- const std::string paramGroup = GridGeometry::discMethod == DiscretizationMethod::ccmpfa ? "MpfaTest" : "";
+ const std::string paramGroup = GridGeometry::discMethod == DiscretizationMethods::ccmpfa ? "MpfaTest" : "";
auto problem = std::make_shared<Problem>(gridGeometry, paramGroup);
// get some time loop parameters
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
index 7a399a5635b4e950baae2406d5ead5bef8d3ee65..3c95865ef720202113c039455cb1dbb1407c5b10 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/problem.hh
@@ -101,7 +101,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
//! Property that defines whether mole or mass fractions are used
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
- static const bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
+ static const bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
diff --git a/test/porousmediumflow/1pncmin/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/nonisothermal/problem.hh
index 4fc0b961fe65d333065c3230dcbaf0475788c855..db672e12be1ae1f89a5fbca1d859ea3bf2131ae5 100644
--- a/test/porousmediumflow/1pncmin/nonisothermal/problem.hh
+++ b/test/porousmediumflow/1pncmin/nonisothermal/problem.hh
@@ -117,7 +117,7 @@ public:
boundaryVaporMoleFrac_ = getParam<Scalar>("Problem.BoundaryMoleFraction");
boundaryTemperature_ = getParam<Scalar>("Problem.BoundaryTemperature");
- unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
+ unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box ? dim : 0;
permeability_.resize(gridGeometry->gridView().size(codim));
porosity_.resize(gridGeometry->gridView().size(codim));
reactionRate_.resize(gridGeometry->gridView().size(codim));
diff --git a/test/porousmediumflow/2p/adaptive/problem.hh b/test/porousmediumflow/2p/adaptive/problem.hh
index 78753253ace4181c1cdcd7c88493e167e4865f37..bb5a1b49c4cf3d9c005d9bd5075966d6b7d62fa7 100644
--- a/test/porousmediumflow/2p/adaptive/problem.hh
+++ b/test/porousmediumflow/2p/adaptive/problem.hh
@@ -47,7 +47,7 @@ class TwoPTestProblemAdaptive : public TwoPTestProblem<TypeTag>
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
public:
TwoPTestProblemAdaptive(std::shared_ptr<const GridGeometry> gridGeometry)
diff --git a/test/porousmediumflow/2p/incompressible/spatialparams.hh b/test/porousmediumflow/2p/incompressible/spatialparams.hh
index fdb750dcb2c7d3aa35d23757364e119b5d1a55e6..b5cf628e9dd6e67acac8b94a4d81d7ec71fb7a75 100644
--- a/test/porousmediumflow/2p/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/incompressible/spatialparams.hh
@@ -137,7 +137,7 @@ public:
template<class SolutionVector>
void updateMaterialInterfaces(const SolutionVector& x)
{
- if (GridGeometry::discMethod == DiscretizationMethod::box)
+ if (GridGeometry::discMethod == DiscretizationMethods::box)
materialInterfaces_ = std::make_unique<MaterialInterfaces>(this->gridGeometry(), *this, x);
}
diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
index 154d691cff67d8f0362505505fb086ee4d97f12c..28d64f12a908f798f536f3fdc601b6d113d92927 100644
--- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh
@@ -69,7 +69,7 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem<Typ
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
enum { dofCodim = isBox ? dim : 0 };
public:
TwoPTwoCChemicalNonequilibriumProblem(std::shared_ptr<const GridGeometry> gridGeometry)
diff --git a/test/porousmediumflow/2pnc/fuelcell/problem.hh b/test/porousmediumflow/2pnc/fuelcell/problem.hh
index d43297e67269a3572c088e92ba0fe647fba24aee..54415b946293394bc17e0f453c15fa6f3310d014 100644
--- a/test/porousmediumflow/2pnc/fuelcell/problem.hh
+++ b/test/porousmediumflow/2pnc/fuelcell/problem.hh
@@ -74,7 +74,7 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
#endif
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
using GlobalPosition = typename SubControlVolume::GlobalPosition;
enum { dofCodim = isBox ? dim : 0 };
diff --git a/test/porousmediumflow/2pncmin/isothermal/problem.hh b/test/porousmediumflow/2pncmin/isothermal/problem.hh
index fc608bacb623a3344810621b4a344e3e30a3a4bd..d0a22787e692d5b2ef22ccdb6636d232a8ba86fa 100644
--- a/test/porousmediumflow/2pncmin/isothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/isothermal/problem.hh
@@ -142,7 +142,7 @@ public:
temperatureHigh_ = getParam<Scalar>("FluidSystem.TemperatureHigh");
name_ = getParam<std::string>("Problem.Name");
- unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
+ unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box ? dim : 0;
permeability_.resize(gridGeometry->gridView().size(codim));
FluidSystem::init(/*Tmin=*/temperatureLow_,
diff --git a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
index e662966c18dbb7f5193c9b7dc201364d24a8124e..7719df63e7df4219f824ad46c12cd3a558be2eea 100644
--- a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh
@@ -147,7 +147,7 @@ public:
initGasSaturation_ = getParam<Scalar>("Problem.InitialGasSaturation");
initSalinity_ = getParam<Scalar>("Problem.InitialSalinity");
- unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
+ unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box ? dim : 0;
permeability_.resize(gridGeometry->gridView().size(codim));
FluidSystem::init(/*Tmin=*/temperatureLow_,
diff --git a/test/porousmediumflow/co2/problem.hh b/test/porousmediumflow/co2/problem.hh
index 3e6db0df59f257f6aaea2fc6411cc2f3783fbd49..f3633e74e2fefefe48a79d59e34d139014b4c6a7 100644
--- a/test/porousmediumflow/co2/problem.hh
+++ b/test/porousmediumflow/co2/problem.hh
@@ -129,7 +129,7 @@ class HeterogeneousProblem : public PorousMediumFlowProblem<TypeTag>
// the discretization method we are using
static constexpr auto discMethod = GetPropType<TypeTag, Properties::GridGeometry>::discMethod;
- static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box;
// world dimension to access gravity vector
static constexpr int dimWorld = GridView::dimensionworld;
diff --git a/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh
index 034f6fed0565d916597c5f0ba492dfefedab3185..f419ef311d876f09abbf734af9d97cdcbff420ba 100644
--- a/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/2p2ccomparison/problem.hh
@@ -75,7 +75,7 @@ class MPNCComparisonProblem
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
- static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
+ static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethods::box;
public:
MPNCComparisonProblem(std::shared_ptr<const GridGeometry> gridGeometry)