From b2f03676a40790eeb82d85011e28399507022ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Fri, 19 Oct 2018 11:00:21 +0200
Subject: [PATCH] [facet] free darcys law alias from typetag
---
dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh | 8 +++-----
dumux/multidomain/facet/cellcentered/tpfa/properties.hh | 5 ++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
index 96b0b31011..56e3ca98e9 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
@@ -62,12 +62,10 @@ class CCTpfaFacetCouplingDarcysLawCache;
* in the context of coupled models where the coupling occurs across the facets of the bulk
* domain elements with a lower-dimensional domain living on these facets.
*/
-template<class TypeTag>
+template<class ScalarType, class FVGridGeometry>
using CCTpfaFacetCouplingDarcysLaw =
- CCTpfaFacetCouplingDarcysLawImpl< typename GET_PROP_TYPE(TypeTag, Scalar),
- typename GET_PROP_TYPE(TypeTag, FVGridGeometry),
- ( int(GET_PROP_TYPE(TypeTag, GridView)::dimension) <
- int(GET_PROP_TYPE(TypeTag, GridView)::dimensionworld) ) >;
+ CCTpfaFacetCouplingDarcysLawImpl< ScalarType, FVGridGeometry, ( int(FVGridGeometry::GridView::dimension) <
+ int(FVGridGeometry::GridView::dimensionworld) ) >;
/*!
* \ingroup MultiDomain
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/properties.hh b/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
index 0b97c42906..16e6ef0e9c 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
@@ -47,7 +47,10 @@ namespace Properties {
NEW_TYPE_TAG(CCTpfaFacetCouplingModel, INHERITS_FROM(CCTpfaModel));
//! Use the tpfa facet coupling-specific Darcy's law
-SET_TYPE_PROP(CCTpfaFacetCouplingModel, AdvectionType, CCTpfaFacetCouplingDarcysLaw<TypeTag>);
+SET_TYPE_PROP(CCTpfaFacetCouplingModel,
+ AdvectionType,
+ CCTpfaFacetCouplingDarcysLaw< typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, FVGridGeometry) >);
//! Use the cc local residual for models with facet coupling
SET_TYPE_PROP(CCTpfaFacetCouplingModel, BaseLocalResidual, CCFacetCouplingLocalResidual<TypeTag>);
--
GitLab