[disc][cc] Free element boundary types from TypeTag

dumux/discretization/cellcentered/elementboundarytypes.hh

@@ -24,10 +24,7 @@
 #ifndef DUMUX_CC_ELEMENT_BOUNDARY_TYPES_HH
 #define DUMUX_CC_ELEMENT_BOUNDARY_TYPES_HH
 
-#include <dumux/common/properties.hh>
-
-namespace Dumux
-{
+namespace Dumux {
 
 /*!
  * \ingroup CCDiscretization
@@ -37,16 +34,9 @@ namespace Dumux
  *        a common base local residual, which passes an ElementBoundaryTypes
  *        object to the implemented interfaces.
  */
-template<class TypeTag>
 class CCElementBoundaryTypes
 {
-    using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
-    using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-    using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
-    using Element = typename GridView::template Codim<0>::Entity;
-
 public:
-
     /*!
      * \brief Update the boundary types for all vertices of an element.
      *
@@ -55,6 +45,7 @@ public:
      *                types should be collected
      * \param fvGeometry The element finite volume geometry
      */
+    template<class Problem, class Element, class FVElementGeometry>
     void update(const Problem &problem,
                 const Element &element,
                 const FVElementGeometry &fvGeometry)

dumux/discretization/cellcentered/mpfa/properties.hh

@@ -173,7 +173,7 @@ SET_TYPE_PROP(CCMpfaModel, GridVolumeVariables, CCGridVolumeVariables<TypeTag, G
 SET_TYPE_PROP(CCMpfaModel, ElementSolutionVector, CCElementSolution<TypeTag>);
 
 //! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(CCMpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
+SET_TYPE_PROP(CCMpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes);
 
 //! Set the BaseLocalResidual to CCLocalResidual
 SET_TYPE_PROP(CCMpfaModel, BaseLocalResidual, CCLocalResidual<TypeTag>);

dumux/discretization/cellcentered/tpfa/properties.hh

@@ -85,7 +85,7 @@ SET_TYPE_PROP(CCTpfaModel, GridVolumeVariables, CCGridVolumeVariables<TypeTag, G
 SET_TYPE_PROP(CCTpfaModel, ElementSolutionVector, CCElementSolution<TypeTag>);
 
 //! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(CCTpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
+SET_TYPE_PROP(CCTpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes);
 
 //! Set the BaseLocalResidual to CCLocalResidual
 SET_TYPE_PROP(CCTpfaModel, BaseLocalResidual, CCLocalResidual<TypeTag>);

dumux/discretization/staggered/properties.hh

@@ -52,11 +52,10 @@
 #include <dune/istl/multitypeblockvector.hh>
 #include <dune/istl/multitypeblockmatrix.hh>
 
-namespace Dumux
-{
+namespace Dumux {
 
 // forward declarations
-template<class TypeTag> class CCElementBoundaryTypes;
+class CCElementBoundaryTypes;
 
 namespace Properties
 {
@@ -100,7 +99,7 @@ SET_TYPE_PROP(StaggeredModel, ElementSolutionVector, Dune::BlockVector<typename
 SET_TYPE_PROP(StaggeredModel, GridVariables, StaggeredGridVariables<TypeTag>);
 
 //! Use the cell center element boundary types per default
-SET_TYPE_PROP(StaggeredModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, ElementBoundaryTypes, CCElementBoundaryTypes);
 
 //! Set the BaseLocalResidual to StaggeredLocalResidual
 SET_TYPE_PROP(StaggeredModel, BaseLocalResidual, StaggeredLocalResidual<TypeTag>);