From e952590957e8ec246986697beb42ed4ad5134f89 Mon Sep 17 00:00:00 2001
From: Martin Beck <martin.beck@iws.uni-stuttgart.de>
Date: Mon, 4 Jul 2016 16:29:13 +0200
Subject: [PATCH] [effectivepermeabilityrutqvisttsang] Got rid of dim as
template parameter
The type of effectivePermeability is auto instead of a FieldMatrix. This
is more flexible and does not require dim as a template parameter.
---
dumux/geomechanics/el2p/propertydefaults.hh | 4 +---
.../fluidmatrixinteractions/permeabilityrutqvisttsang.hh | 6 +++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dumux/geomechanics/el2p/propertydefaults.hh b/dumux/geomechanics/el2p/propertydefaults.hh
index c9bd9ff3ff..ed0234067b 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 bfb936dbfa..1ffc313847 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);
--
GitLab