diff --git a/dumux/geomechanics/el2p/propertydefaults.hh b/dumux/geomechanics/el2p/propertydefaults.hh index c9bd9ff3ff6736f16dd5d99c025303c3aeff72db..ed0234067bd7153dbdb2fe86d55328f2ad318c7c 100644 --- a/dumux/geomechanics/el2p/propertydefaults.hh +++ b/dumux/geomechanics/el2p/propertydefaults.hh @@ -144,10 +144,8 @@ SET_PROP(BoxElasticTwoP, EffectivePermeabilityModel) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; - enum{dim = GridView::dimension}; public: - typedef Dumux::PermeabilityRutqvistTsang<Scalar, dim> type; + typedef Dumux::PermeabilityRutqvistTsang<Scalar> type; }; // SET_TYPE_PROP(BoxElasticTwoP, EffectivePermeabilityModel, Dumux::PermeabilityRutqvistTsang<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Gridview)::dimension>); diff --git a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh index bfb936dbfad713f04516521ad625af114b600cbd..1ffc3138475f9039d468e77cc37e17e11093226c 100644 --- a/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh +++ b/dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh @@ -44,7 +44,7 @@ namespace Dumux * \f$ k_\text{eff} = k_{\text{0}} \cdot \text{exp} \left[22.2\left(\phi_\text{eff}/ \phi_\text{0} -1 \right) \right] \f$ * */ -template<class Scalar, int dim> +template<class Scalar> class PermeabilityRutqvistTsang { public: @@ -65,7 +65,7 @@ public: * Deep Saline Aquifers, PhD thesis \cite darcis2013 . */ template<class VolumeVariables, class SpatialParams, class Element, class FVGeometry> - static Dune::FieldMatrix<Scalar, dim, dim> effectivePermeability(const VolumeVariables& volVars, + static auto effectivePermeability(const VolumeVariables& volVars, const SpatialParams& spatialParams, const Element& element, const FVGeometry& fvGeometry, @@ -80,7 +80,7 @@ public: 22.2 * (effPorosity / initialPorosity - 1); - Dune::FieldMatrix<Scalar, dim, dim> Keff + auto Keff = spatialParams.intrinsicPermeability(element, fvGeometry, scvIdx); Keff *= exp(exponent);