[disc][porousmediumflow][co2] Use discretization tag instead of enum as template argument.

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!");

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