diff --git a/dumux/discretization/box/scvftoscvboundarytypes.hh b/dumux/discretization/box/scvftoscvboundarytypes.hh index d4b540a9fb348d6a530e46b079b21e677783df97..857d4f1b180e28009a401dca2ac954e80ff93b9b 100644 --- a/dumux/discretization/box/scvftoscvboundarytypes.hh +++ b/dumux/discretization/box/scvftoscvboundarytypes.hh @@ -34,7 +34,7 @@ namespace Dumux { * \ingroup BoxDiscretization * \brief Convert intersection boundary types to vertex boundary types */ -template<class BoundaryTypes, DiscretizationMethod discMethod> +template<class BoundaryTypes, class DiscretizationMethod> class ScvfToScvBoundaryTypes { public: @@ -44,7 +44,7 @@ public: void computeBoundaryTypes(const Problem& problem) { // only do something for box - if (discMethod == DiscretizationMethods::box) + if (DiscretizationMethod{} == 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 == DiscretizationMethods::box) + if (DiscretizationMethod{} == DiscretizationMethods::box) return scvBoundaryTypes[scv.dofIndex()]; else DUNE_THROW(Dune::InvalidStateException, "Only use this for the box discretization!"); diff --git a/test/porousmediumflow/co2/problem.hh b/test/porousmediumflow/co2/problem.hh index f3633e74e2fefefe48a79d59e34d139014b4c6a7..95ec669e2fa7043d4efa54e3736aacfc10500b3b 100644 --- a/test/porousmediumflow/co2/problem.hh +++ b/test/porousmediumflow/co2/problem.hh @@ -128,7 +128,8 @@ class HeterogeneousProblem : public PorousMediumFlowProblem<TypeTag> static constexpr bool useMoles = ModelTraits::useMoles(); // the discretization method we are using - static constexpr auto discMethod = GetPropType<TypeTag, Properties::GridGeometry>::discMethod; + using DiscretizationMethod = DiscretizationMethods::Box; + static constexpr DiscretizationMethod discMethod{}; static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethods::box; // world dimension to access gravity vector @@ -445,7 +446,7 @@ private: // vtk output std::vector<Scalar> vtkKxx_, vtkPorosity_, vtkBoxVolume_, vtkTemperature_; - ScvfToScvBoundaryTypes<BoundaryTypes, discMethod> scvfToScvBoundaryTypes_; + ScvfToScvBoundaryTypes<BoundaryTypes, DiscretizationMethod> scvfToScvBoundaryTypes_; }; } // end namespace Dumux