[mpfa] make quad point runtime specifiable

dumux/discretization/cellcentered/mpfa/globalfvgeometry.hh

@@ -129,7 +129,7 @@ public:
         elementMap_.resize(numScvs);
 
         // the quadrature point to be used on the scvf
-        const Scalar q = GET_PROP_VALUE(TypeTag, QuadraturePoint);
+        const Scalar q = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Q);
 
         // Build the SCVs and SCV faces
         IndexType scvfIdx = 0;

dumux/implicit/cellcentered/mpfa/properties.hh

@@ -48,10 +48,8 @@ NEW_PROP_TAG(MpfaHelper); //! A Helper class depending on the mpfa method and gr
 NEW_PROP_TAG(InteractionVolume); //! The inner interaction volume type
 NEW_PROP_TAG(BoundaryInteractionVolume); //! The interaction volume type used on the boundaries
 NEW_PROP_TAG(GlobalInteractionVolumeSeeds); //! Class storing and managing the interaction volume seeds
-NEW_PROP_TAG(QuadraturePoint); //! The quadrature point on the sub control volume faces (0.0 <= q <= 1.0)
-NEW_PROP_TAG(FacetCoupling); //! This property has to be set to true if a sub model on the element facets should be existing
 NEW_PROP_TAG(UseTpfaBoundary); //! This property specifies whether or not tpfa is to be used to handle the boundary fluxes
-NEW_PROP_TAG(Xi); //! Parameter used for interior neumann boundaries or coupling terms on the element facets (0.0 <= xi <= 1.0)
+NEW_PROP_TAG(MpfaQ); //! The quadrature point on the sub control volume faces (0.0 <= q <= 1.0)
 }
 }
 

dumux/implicit/cellcentered/mpfa/propertydefaults.hh

@@ -108,17 +108,11 @@ public:
     typedef Dumux::CCMpfaSubControlVolumeFace<ScvfGeometry, IndexType> type;
 };
 
-// By default, we set the quadrature point to the mid point of the element facets
-SET_SCALAR_PROP(CCMpfaModel, QuadraturePoint, 0.0);
-
-// Facet coupling is deactivated by default
-SET_BOOL_PROP(CCMpfaModel, FacetCoupling, false);
-
 // By default, we use tpfa on the boundaries
 SET_BOOL_PROP(CCMpfaModel, UseTpfaBoundary, true);
 
-// By default, set the coupling parameter to 1.0
-SET_SCALAR_PROP(CCMpfaModel, Xi, 1.0);
+// By default, we set the quadrature point to the mid point of the element facets
+SET_SCALAR_PROP(CCMpfaModel, MpfaQ, 0.0);
 
 } // namespace Properties