[disc][wmpfa] Add ccwmpfa as possible discretization method

dumux/discretization/cellcentered/elementsolution.hh

@@ -112,7 +112,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,
+                    GridGeometry::discMethod == DiscretizationMethod::ccmpfa ||
+                    GridGeometry::discMethod == DiscretizationMethod::ccwmpfa,
                     CCElementSolution<typename GridGeometry::LocalView,
                                       std::decay_t<decltype(std::declval<SolutionVector>()[0])>>
                     >
@@ -128,7 +129,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,
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa ||
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccwmpfa,
                     CCElementSolution<FVElementGeometry, typename ElementVolumeVariables::VolumeVariables::PrimaryVariables>>
 {
     using PrimaryVariables = typename ElementVolumeVariables::VolumeVariables::PrimaryVariables;
@@ -143,7 +145,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,
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa ||
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccwmpfa,
                     CCElementSolution<FVElementGeometry, PrimaryVariables>>
 {
     return CCElementSolution<FVElementGeometry, PrimaryVariables>(std::move(priVars));
@@ -157,7 +160,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,
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccmpfa ||
+                    FVElementGeometry::GridGeometry::discMethod == DiscretizationMethod::ccwmpfa,
                     CCElementSolution<FVElementGeometry, PrimaryVariables>>
 {
     return CCElementSolution<FVElementGeometry, PrimaryVariables>(priVars);

dumux/discretization/method.hh

@@ -35,7 +35,7 @@ namespace Dumux {
      */
     enum class DiscretizationMethod
     {
-        none, box, cctpfa, ccmpfa, staggered, fem
+        none, box, cctpfa, ccmpfa, ccwmpfa, staggered, fem
     };
 
 } // end namespace Dumux