From ed97e627a1327498d5fd09828bb994bad8f913b3 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 18:01:03 +0200
Subject: [PATCH 1/6] [fvassembler] Export LocalResidual type

---
 dumux/assembly/fvassembler.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index c60d14fff8..7a8ba2f9a9 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -51,7 +51,6 @@ template<class TypeTag, DiffMethod diffMethod, bool isImplicit = true>
 class FVAssembler
 {
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
     using Element = typename GridView::template Codim<0>::Entity;
     using TimeLoop = TimeLoopBase<GetPropType<TypeTag, Properties::Scalar>>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
@@ -69,6 +68,7 @@ public:
     using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
+    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
 
     using ResidualType = SolutionVector;
 
-- 
GitLab


From f63f2579c3ba65735835d278242f1295c86c96ef Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 18:01:34 +0200
Subject: [PATCH 2/6] [box] Do not use property system in boxlocalassembler

---
 dumux/assembly/boxlocalassembler.hh | 64 ++++++++++++-----------------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
index 292ddf3be6..d37b5d99d5 100644
--- a/dumux/assembly/boxlocalassembler.hh
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -28,7 +28,6 @@
 #include <dune/istl/matrixindexset.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numericdifferentiation.hh>
 #include <dumux/assembly/numericepsilon.hh>
@@ -53,13 +52,10 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit>
 class BoxLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>
 {
     using ParentType = FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
-
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
-
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+    using SolutionVector = typename Assembler::ResidualType;
+    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
 public:
 
     using ParentType::ParentType;
@@ -226,12 +222,12 @@ public:
                     const auto dirichletValues = this->problem().dirichlet(this->element(), scvI);
 
                     // set the Dirichlet conditions in residual and jacobian
-                    for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+                    for (auto eqIdx = 0U; eqIdx < dirichletValues.size(); ++eqIdx)
                     {
                         if (bcTypes.isDirichlet(eqIdx))
                         {
                             const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
-                            assert(0 <= pvIdx && pvIdx < numEq);
+                            assert(0 <= pvIdx && pvIdx < dirichletValues.size());
                             applyDirichlet(scvI, dirichletValues, eqIdx, pvIdx);
                         }
                     }
@@ -265,18 +261,14 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr
 {
     using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
     using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    using ElementResidualVector = typename LocalResidual::ElementResidualVector;
-
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
-    enum { dim = GetPropType<TypeTag, Properties::GridGeometry>::GridView::dimension };
 
-    static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
+    using Scalar = typename Assembler::Scalar;
+    using GridVariables = typename Assembler::GridVariables;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using ElementResidualVector = typename Assembler::LocalResidual::ElementResidualVector;
 
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
+    static constexpr auto dim = Assembler::GridGeometry::GridView::dimension;
 public:
 
     using ParentType::ParentType;
@@ -320,7 +312,7 @@ public:
             // dof index and corresponding actual pri vars
             const auto dofIdx = scv.dofIndex();
             auto& curVolVars = this->getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
-            const VolumeVariables origVolVars(curVolVars);
+            const auto origVolVars = curVolVars;
 
             // calculate derivatives w.r.t to the privars at the dof at hand
             for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
@@ -384,16 +376,14 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa
 {
     using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
     using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    using ElementResidualVector = typename LocalResidual::ElementResidualVector;
 
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
-    enum { dim = GetPropType<TypeTag, Properties::GridGeometry>::GridView::dimension };
+    using Scalar = typename Assembler::Scalar;
+    using GridVariables = typename Assembler::GridVariables;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using ElementResidualVector = typename Assembler::LocalResidual::ElementResidualVector;
 
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
+    static constexpr auto dim = Assembler::GridGeometry::GridView::dimension;
 public:
 
     using ParentType::ParentType;
@@ -441,7 +431,7 @@ public:
             // dof index and corresponding actual pri vars
             const auto dofIdx = scv.dofIndex();
             auto& curVolVars = this->getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
-            const VolumeVariables origVolVars(curVolVars);
+            const auto origVolVars = curVolVars;
 
             // calculate derivatives w.r.t to the privars at the dof at hand
             for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
@@ -496,11 +486,10 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/t
 {
     using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
     using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    using ElementResidualVector = typename LocalResidual::ElementResidualVector;
 
+    using GridVariables = typename Assembler::GridVariables;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using ElementResidualVector = typename Assembler::LocalResidual::ElementResidualVector;
 public:
 
     using ParentType::ParentType;
@@ -615,11 +604,10 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/f
 {
     using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
     using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
-    using ElementResidualVector = typename LocalResidual::ElementResidualVector;
 
+    using GridVariables = typename Assembler::GridVariables;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using ElementResidualVector = typename Assembler::LocalResidual::ElementResidualVector;
 public:
 
     using ParentType::ParentType;
-- 
GitLab


From 146ba256b474041c077d0b18bc278977aee6f372 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 18:16:52 +0200
Subject: [PATCH 3/6] [cc] Do not use property system in cclocalassembler

---
 dumux/assembly/cclocalassembler.hh | 79 +++++++++++++++++-------------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index 004bb7e8f0..4c7b715fa1 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -25,12 +25,12 @@
 #ifndef DUMUX_CC_LOCAL_ASSEMBLER_HH
 #define DUMUX_CC_LOCAL_ASSEMBLER_HH
 
+#include <dune/common/fvector.hh>
 #include <dune/common/reservedvector.hh>
 #include <dune/grid/common/gridenums.hh> // for GhostEntity
 #include <dune/istl/matrixindexset.hh>
 
 #include <dumux/common/reservedblockvector.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/numericdifferentiation.hh>
 #include <dumux/assembly/numericepsilon.hh>
@@ -56,12 +56,10 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit>
 class CCLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>
 {
     using ParentType = FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>;
-    using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+    using SolutionVector = typename Assembler::ResidualType;
+    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
 
     static_assert(!Assembler::Problem::enableInternalDirichletConstraints(), "Internal Dirichlet constraints are currently not implemented for cc-methods!");
 
@@ -134,20 +132,24 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
 {
     using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
     using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
-    using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    using FVElementGeometry = typename GridGeometry::LocalView;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
-    enum { dim = GetPropType<TypeTag, Properties::GridGeometry>::GridView::dimension };
-
-    using FluxStencil = Dumux::FluxStencil<FVElementGeometry>;
+
+    using Scalar = typename Assembler::Scalar;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+    using SolutionVector = typename Assembler::ResidualType;
+    using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView;
+    using GridGeometry = typename Assembler::GridGeometry;
+    using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
+
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
+    static constexpr auto dim = GridGeometry::GridView::dimension;
+
+    // TODO Deduce from Assembler::Problem
+    using NumEqVector = Dune::FieldVector<Scalar, numEq>;
+
+    using FluxStencil = Dumux::FluxStencil<typename GridGeometry::LocalView>;
     static constexpr int maxElementStencilSize = GridGeometry::maxElementStencilSize;
-    static constexpr bool enableGridFluxVarsCache = getPropValue<TypeTag, Properties::EnableGridFluxVariablesCache>();
+    static constexpr bool enableGridFluxVarsCache = GridVariables::GridFluxVariablesCache::cachingEnabled;
 
 public:
 
@@ -320,13 +322,17 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal
 {
     using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
     using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
 
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
+    using Scalar = typename Assembler::Scalar;
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+    using GridGeometry = typename Assembler::GridGeometry;
+    using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
+
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
+
+    // TODO Deduce from Assembler::Problem
+    using NumEqVector = Dune::FieldVector<Scalar, numEq>;
 
 public:
     using ParentType::ParentType;
@@ -432,11 +438,14 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/tr
 {
     using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
     using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
 
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
+
+    // TODO Deduce from Assembler::Problem
+    using NumEqVector = Dune::FieldVector<typename Assembler::Scalar, numEq>;
 
 public:
     using ParentType::ParentType;
@@ -524,12 +533,14 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/fa
 {
     using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
     using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
-    using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
 
-    enum { numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq() };
+    using JacobianMatrix = typename Assembler::JacobianMatrix;
+    using GridVariables = typename Assembler::GridVariables;
+
+    static constexpr auto numEq = GridVariables::VolumeVariables::PrimaryVariables::dimension;
 
+    // TODO Deduce from Assembler::Problem
+    using NumEqVector = Dune::FieldVector<typename Assembler::Scalar, numEq>;
 public:
     using ParentType::ParentType;
 
-- 
GitLab


From ee39ce4ca39c2f8dd080c38375aebed9dd58017b Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 18:43:51 +0200
Subject: [PATCH 4/6] [localresidual] Export element boundary types

---
 dumux/assembly/boxlocalresidual.hh                     | 2 +-
 dumux/assembly/cclocalresidual.hh                      | 2 +-
 dumux/assembly/fvlocalresidual.hh                      | 3 ++-
 dumux/assembly/staggeredlocalresidual.hh               | 2 +-
 dumux/freeflow/navierstokes/staggered/localresidual.hh | 2 +-
 dumux/multidomain/facet/box/localresidual.hh           | 2 +-
 dumux/porousmediumflow/mpnc/localresidual.hh           | 3 +--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dumux/assembly/boxlocalresidual.hh b/dumux/assembly/boxlocalresidual.hh
index ca6410ddb2..9dcacf6460 100644
--- a/dumux/assembly/boxlocalresidual.hh
+++ b/dumux/assembly/boxlocalresidual.hh
@@ -47,7 +47,6 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Element = typename GridView::template Codim<0>::Entity;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
@@ -56,6 +55,7 @@ class BoxLocalResidual : public FVLocalResidual<TypeTag>
 
 public:
     using ElementResidualVector = typename ParentType::ElementResidualVector;
+    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ParentType::ParentType;
 
     //! evaluate flux residuals for one sub control volume face and add to residual
diff --git a/dumux/assembly/cclocalresidual.hh b/dumux/assembly/cclocalresidual.hh
index 9f1c48fc76..790d65bd56 100644
--- a/dumux/assembly/cclocalresidual.hh
+++ b/dumux/assembly/cclocalresidual.hh
@@ -43,7 +43,6 @@ class CCLocalResidual : public FVLocalResidual<TypeTag>
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
@@ -51,6 +50,7 @@ class CCLocalResidual : public FVLocalResidual<TypeTag>
 
 public:
     using ElementResidualVector = typename ParentType::ElementResidualVector;
+    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ParentType::ParentType;
 
     //! evaluate the flux residual for a sub control volume face and add to residual
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 3c105ea8b6..21530e32a4 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -54,7 +54,6 @@ class FVLocalResidual
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
     using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
     using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
@@ -158,6 +157,7 @@ public:
         return residual;
     }
 
+    template<class ElementBoundaryTypes>
     ElementResidualVector evalFluxAndSource(const Element& element,
                                             const FVElementGeometry& fvGeometry,
                                             const ElementVolumeVariables& elemVolVars,
@@ -358,6 +358,7 @@ public:
      * \param elemFluxVarsCache The flux variable caches for the element stencil
      * \param scvf The sub control volume face the flux term is integrated over
      */
+    template<class ElementBoundaryTypes>
     void evalFlux(ElementResidualVector& residual,
                   const Problem& problem,
                   const Element& element,
diff --git a/dumux/assembly/staggeredlocalresidual.hh b/dumux/assembly/staggeredlocalresidual.hh
index 15ef2a4a9a..ea67a2dae9 100644
--- a/dumux/assembly/staggeredlocalresidual.hh
+++ b/dumux/assembly/staggeredlocalresidual.hh
@@ -44,7 +44,6 @@ class StaggeredLocalResidual
     using Implementation = GetPropType<TypeTag, Properties::LocalResidual>;
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using Element = typename GridView::template Codim<0>::Entity;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
@@ -62,6 +61,7 @@ public:
     using CellCenterResidualValue = GetPropType<TypeTag, Properties::CellCenterPrimaryVariables>;
     using FaceResidualValue = GetPropType<TypeTag, Properties::FacePrimaryVariables>;
     using ElementResidualVector = CellCenterResidualValue;
+    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
 
     //! the constructor
     StaggeredLocalResidual(const Problem* problem,
diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh
index 7a57d81386..18f2dc8119 100644
--- a/dumux/freeflow/navierstokes/staggered/localresidual.hh
+++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh
@@ -68,7 +68,6 @@ class NavierStokesResidualImpl<TypeTag, DiscretizationMethod::staggered>
     using Element = typename GridView::template Codim<0>::Entity;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using CellCenterPrimaryVariables = GetPropType<TypeTag, Properties::CellCenterPrimaryVariables>;
     using FacePrimaryVariables = GetPropType<TypeTag, Properties::FacePrimaryVariables>;
     using FluxVariables = GetPropType<TypeTag, Properties::FluxVariables>;
@@ -80,6 +79,7 @@ class NavierStokesResidualImpl<TypeTag, DiscretizationMethod::staggered>
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
 
 public:
+    using ElementBoundaryTypes = typename ParentType::ElementBoundaryTypes;
     using EnergyLocalResidual = FreeFlowEnergyLocalResidual<GridGeometry, FluxVariables, ModelTraits::enableEnergyBalance(), (ModelTraits::numFluidComponents() > 1)>;
 
     // account for the offset of the cell center privars within the PrimaryVariables container
diff --git a/dumux/multidomain/facet/box/localresidual.hh b/dumux/multidomain/facet/box/localresidual.hh
index f4d548c369..55ef0b47fe 100644
--- a/dumux/multidomain/facet/box/localresidual.hh
+++ b/dumux/multidomain/facet/box/localresidual.hh
@@ -45,7 +45,6 @@ class BoxFacetCouplingLocalResidual : public FVLocalResidual<TypeTag>
     using Problem = GetPropType<TypeTag, Properties::Problem>;
     using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
     using Element = typename GridView::template Codim<0>::Entity;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
@@ -54,6 +53,7 @@ class BoxFacetCouplingLocalResidual : public FVLocalResidual<TypeTag>
 
 public:
     using ElementResidualVector = typename ParentType::ElementResidualVector;
+    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ParentType::ParentType;
 
     //! evaluate flux residuals for one sub control volume face and add to residual
diff --git a/dumux/porousmediumflow/mpnc/localresidual.hh b/dumux/porousmediumflow/mpnc/localresidual.hh
index 3ae3b7f5e9..fa400b6081 100644
--- a/dumux/porousmediumflow/mpnc/localresidual.hh
+++ b/dumux/porousmediumflow/mpnc/localresidual.hh
@@ -47,7 +47,6 @@ class MPNCLocalResidual : public CompositionalLocalResidual<TypeTag>
     using ParentType = CompositionalLocalResidual<TypeTag>;
     using Element = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
     using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
@@ -58,7 +57,7 @@ class MPNCLocalResidual : public CompositionalLocalResidual<TypeTag>
 
 public:
     using ParentType::ParentType;
-
+    using typename ParentType::ElementBoundaryTypes;
     using typename ParentType::ElementResidualVector;
 
     ElementResidualVector evalFluxAndSource(const Element& element,
-- 
GitLab


From 794993c83e1da04a6fb6d27e7f9ceac9d8d18a45 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 18:50:59 +0200
Subject: [PATCH 5/6] [fvlovalassembler] Do not use properties

---
 dumux/assembly/fvlocalassemblerbase.hh | 37 +++++++++++++-------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh
index 7d894ca276..be057fafac 100644
--- a/dumux/assembly/fvlocalassemblerbase.hh
+++ b/dumux/assembly/fvlocalassemblerbase.hh
@@ -29,7 +29,6 @@
 #include <dune/istl/matrixindexset.hh>
 
 #include <dumux/common/reservedblockvector.hh>
-#include <dumux/common/properties.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/assembly/diffmethod.hh>
 
@@ -46,25 +45,25 @@ namespace Dumux {
 template<class TypeTag, class Assembler, class Implementation, bool useImplicitAssembly>
 class FVLocalAssemblerBase
 {
-    using Problem = GetPropType<TypeTag, Properties::Problem>;
-    using GridView = typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
-    using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
-    using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
+    using Problem = typename Assembler::Problem;
+    using Scalar = typename Assembler::Scalar;
+    using GridVariables = typename Assembler::GridVariables;
     using SolutionVector = typename Assembler::ResidualType;
-    using ElementBoundaryTypes = GetPropType<TypeTag, Properties::ElementBoundaryTypes>;
-    using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
-    using SubControlVolume = typename FVElementGeometry::SubControlVolume;
-    using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
-    using GridVolumeVariables = GetPropType<TypeTag, Properties::GridVolumeVariables>;
-    using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
-    using VolumeVariables = GetPropType<TypeTag, Properties::VolumeVariables>;
-    using ElementFluxVariablesCache = typename GetPropType<TypeTag, Properties::GridFluxVariablesCache>::LocalView;
-    using Element = typename GridView::template Codim<0>::Entity;
-    static constexpr auto numEq = GetPropType<TypeTag, Properties::ModelTraits>::numEq();
+    using GridGeometry = typename Assembler::GridGeometry;
+    using FVElementGeometry = typename GridGeometry::LocalView;
+    using SubControlVolume = typename GridGeometry::SubControlVolume;
+    using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace;
+    using GridVolumeVariables = typename GridVariables::GridVolumeVariables;
+    using ElementVolumeVariables = typename GridVolumeVariables::LocalView;
+    using VolumeVariables = typename GridVariables::VolumeVariables;
+    using GridFluxVariablesCache = typename GridVariables::GridFluxVariablesCache;
+    using ElementFluxVariablesCache = typename GridFluxVariablesCache::LocalView;
+    using Element = typename GridGeometry::GridView::template Codim<0>::Entity;
+    using ElementBoundaryTypes = typename Assembler::LocalResidual::ElementBoundaryTypes;
+    static constexpr auto numEq = VolumeVariables::PrimaryVariables::dimension;
 
 public:
-    using LocalResidual = GetPropType<TypeTag, Properties::LocalResidual>;
+    using LocalResidual = typename Assembler::LocalResidual;
     using ElementResidualVector = typename LocalResidual::ElementResidualVector;
 
     /*!
@@ -310,11 +309,11 @@ protected:
     const Implementation &asImp_() const
     { return *static_cast<const Implementation*>(this); }
 
-    template<class T = TypeTag, typename std::enable_if_t<!getPropValue<T, Properties::EnableGridVolumeVariablesCache>(), int> = 0>
+    template<class C = GridFluxVariablesCache, typename std::enable_if_t<!C::cachingEnabled, int> = 0>
     VolumeVariables& getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
     { return elemVolVars[scv]; }
 
-    template<class T = TypeTag, typename std::enable_if_t<getPropValue<T, Properties::EnableGridVolumeVariablesCache>(), int> = 0>
+    template<class C = GridFluxVariablesCache, typename std::enable_if_t<C::cachingEnabled, int> = 0>
     VolumeVariables& getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
     { return gridVolVars.volVars(scv); }
 
-- 
GitLab


From 1c6e413df2752ebfddaa3a5747d3cebacb8c428c Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Sun, 3 May 2020 19:11:53 +0200
Subject: [PATCH 6/6] [fvlocalassembler] Remove TypeTag template parameter

---
 dumux/assembly/boxlocalassembler.hh    | 58 +++++++++++++-------------
 dumux/assembly/cclocalassembler.hh     | 58 +++++++++++++-------------
 dumux/assembly/fvassembler.hh          |  4 +-
 dumux/assembly/fvlocalassemblerbase.hh |  3 +-
 4 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
index d37b5d99d5..7b183bc63a 100644
--- a/dumux/assembly/boxlocalassembler.hh
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -43,15 +43,14 @@ namespace Dumux {
  * \ingroup Assembly
  * \ingroup BoxDiscretization
  * \brief A base class for all local box assemblers
- * \tparam TypeTag The TypeTag
  * \tparam Assembler The assembler type
  * \tparam Implementation The actual implementation
  * \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
  */
-template<class TypeTag, class Assembler, class Implementation, bool implicit>
-class BoxLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>
+template<class Assembler, class Implementation, bool implicit>
+class BoxLocalAssemblerBase : public FVLocalAssemblerBase<Assembler, Implementation, implicit>
 {
-    using ParentType = FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>;
+    using ParentType = FVLocalAssemblerBase<Assembler, Implementation, implicit>;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
     using GridVariables = typename Assembler::GridVariables;
     using SolutionVector = typename Assembler::ResidualType;
@@ -242,11 +241,10 @@ public:
  * \ingroup Assembly
  * \ingroup BoxDiscretization
  * \brief An assembler for Jacobian and residual contribution per element (box methods)
- * \tparam TypeTag The TypeTag
  * \tparam diffMethod The differentiation method to residual compute derivatives
  * \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
  */
-template<class TypeTag, class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
+template<class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
 class BoxLocalAssembler;
 
 /*!
@@ -254,13 +252,13 @@ class BoxLocalAssembler;
  * \ingroup BoxDiscretization
  * \brief Box local assembler using numeric differentiation and implicit time discretization
  */
-template<class TypeTag, class Assembler>
-class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/true>
-: public BoxLocalAssemblerBase<TypeTag, Assembler,
-                              BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>, true>
+template<class Assembler>
+class BoxLocalAssembler<Assembler, DiffMethod::numeric, /*implicit=*/true>
+: public BoxLocalAssemblerBase<Assembler,
+                              BoxLocalAssembler<Assembler, DiffMethod::numeric, true>, true>
 {
-    using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
-    using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
+    using ThisType = BoxLocalAssembler<Assembler, DiffMethod::numeric, true>;
+    using ParentType = BoxLocalAssemblerBase<Assembler, ThisType, true>;
 
     using Scalar = typename Assembler::Scalar;
     using GridVariables = typename Assembler::GridVariables;
@@ -369,13 +367,13 @@ public:
  * \ingroup BoxDiscretization
  * \brief Box local assembler using numeric differentiation and explicit time discretization
  */
-template<class TypeTag, class Assembler>
-class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/false>
-: public BoxLocalAssemblerBase<TypeTag, Assembler,
-                              BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>, false>
+template<class Assembler>
+class BoxLocalAssembler<Assembler, DiffMethod::numeric, /*implicit=*/false>
+: public BoxLocalAssemblerBase<Assembler,
+                               BoxLocalAssembler<Assembler, DiffMethod::numeric, false>, false>
 {
-    using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
-    using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
+    using ThisType = BoxLocalAssembler<Assembler, DiffMethod::numeric, false>;
+    using ParentType = BoxLocalAssemblerBase<Assembler, ThisType, false>;
 
     using Scalar = typename Assembler::Scalar;
     using GridVariables = typename Assembler::GridVariables;
@@ -479,13 +477,13 @@ public:
  * \ingroup BoxDiscretization
  * \brief Box local assembler using analytic differentiation and implicit time discretization
  */
-template<class TypeTag, class Assembler>
-class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/true>
-: public BoxLocalAssemblerBase<TypeTag, Assembler,
-                              BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>, true>
+template<class Assembler>
+class BoxLocalAssembler<Assembler, DiffMethod::analytic, /*implicit=*/true>
+: public BoxLocalAssemblerBase<Assembler,
+                              BoxLocalAssembler<Assembler, DiffMethod::analytic, true>, true>
 {
-    using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
-    using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
+    using ThisType = BoxLocalAssembler<Assembler, DiffMethod::analytic, true>;
+    using ParentType = BoxLocalAssemblerBase<Assembler, ThisType, true>;
 
     using GridVariables = typename Assembler::GridVariables;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
@@ -597,13 +595,13 @@ public:
  * \ingroup BoxDiscretization
  * \brief Box local assembler using analytic differentiation and explicit time discretization
  */
-template<class TypeTag, class Assembler>
-class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/false>
-: public BoxLocalAssemblerBase<TypeTag, Assembler,
-                              BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>, false>
+template<class Assembler>
+class BoxLocalAssembler<Assembler, DiffMethod::analytic, /*implicit=*/false>
+: public BoxLocalAssemblerBase<Assembler,
+                              BoxLocalAssembler<Assembler, DiffMethod::analytic, false>, false>
 {
-    using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
-    using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
+    using ThisType = BoxLocalAssembler<Assembler, DiffMethod::analytic, false>;
+    using ParentType = BoxLocalAssemblerBase<Assembler, ThisType, false>;
 
     using GridVariables = typename Assembler::GridVariables;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index 4c7b715fa1..d8cf8deca8 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -47,15 +47,14 @@ namespace Dumux {
  * \ingroup Assembly
  * \ingroup CCDiscretization
  * \brief A base class for all local cell-centered assemblers
- * \tparam TypeTag The TypeTag
  * \tparam Assembler The assembler type
  * \tparam Implementation The actual implementation
  * \tparam implicit Specifies whether the time discretization is implicit or not (i.e. explicit)
  */
-template<class TypeTag, class Assembler, class Implementation, bool implicit>
-class CCLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>
+template<class Assembler, class Implementation, bool implicit>
+class CCLocalAssemblerBase : public FVLocalAssemblerBase<Assembler, Implementation, implicit>
 {
-    using ParentType = FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>;
+    using ParentType = FVLocalAssemblerBase<Assembler, Implementation, implicit>;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
     using GridVariables = typename Assembler::GridVariables;
     using SolutionVector = typename Assembler::ResidualType;
@@ -113,11 +112,10 @@ public:
  * \ingroup Assembly
  * \ingroup CCDiscretization
  * \brief An assembler for Jacobian and residual contribution per element (cell-centered methods)
- * \tparam TypeTag The TypeTag
  * \tparam diffMethod The differentiation method to residual compute derivatives
  * \tparam implicit Specifies whether the time discretization is implicit or not not (i.e. explicit)
  */
-template<class TypeTag, class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
+template<class Assembler, DiffMethod diffMethod = DiffMethod::numeric, bool implicit = true>
 class CCLocalAssembler;
 
 /*!
@@ -125,13 +123,13 @@ class CCLocalAssembler;
  * \ingroup CCDiscretization
  * \brief Cell-centered scheme local assembler using numeric differentiation and implicit time discretization
  */
-template<class TypeTag, class Assembler>
-class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/true>
-: public CCLocalAssemblerBase<TypeTag, Assembler,
-                              CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>, true >
+template<class Assembler>
+class CCLocalAssembler<Assembler, DiffMethod::numeric, /*implicit=*/true>
+: public CCLocalAssemblerBase<Assembler,
+                              CCLocalAssembler<Assembler, DiffMethod::numeric, true>, true >
 {
-    using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
-    using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
+    using ThisType = CCLocalAssembler<Assembler, DiffMethod::numeric, true>;
+    using ParentType = CCLocalAssemblerBase<Assembler, ThisType, true>;
 
     using Scalar = typename Assembler::Scalar;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
@@ -315,13 +313,13 @@ public:
  * \ingroup CCDiscretization
  * \brief Cell-centered scheme local assembler using numeric differentiation and explicit time discretization
  */
-template<class TypeTag, class Assembler>
-class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/false>
-: public CCLocalAssemblerBase<TypeTag, Assembler,
-            CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>, false>
+template<class Assembler>
+class CCLocalAssembler<Assembler, DiffMethod::numeric, /*implicit=*/false>
+: public CCLocalAssemblerBase<Assembler,
+            CCLocalAssembler<Assembler, DiffMethod::numeric, false>, false>
 {
-    using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
-    using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
+    using ThisType = CCLocalAssembler<Assembler, DiffMethod::numeric, false>;
+    using ParentType = CCLocalAssemblerBase<Assembler, ThisType, false>;
 
     using Scalar = typename Assembler::Scalar;
     using JacobianMatrix = typename Assembler::JacobianMatrix;
@@ -431,13 +429,13 @@ public:
  * \ingroup CCDiscretization
  * \brief Cell-centered scheme local assembler using analytic (hand-coded) differentiation and implicit time discretization
  */
-template<class TypeTag, class Assembler>
-class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/true>
-: public CCLocalAssemblerBase<TypeTag, Assembler,
-            CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>, true>
+template<class Assembler>
+class CCLocalAssembler<Assembler, DiffMethod::analytic, /*implicit=*/true>
+: public CCLocalAssemblerBase<Assembler,
+            CCLocalAssembler<Assembler, DiffMethod::analytic, true>, true>
 {
-    using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
-    using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
+    using ThisType = CCLocalAssembler<Assembler, DiffMethod::analytic, true>;
+    using ParentType = CCLocalAssemblerBase<Assembler, ThisType, true>;
 
     using JacobianMatrix = typename Assembler::JacobianMatrix;
     using GridVariables = typename Assembler::GridVariables;
@@ -526,13 +524,13 @@ public:
  * \ingroup CCDiscretization
  * \brief Cell-centered scheme local assembler using analytic (hand-coded) differentiation and explicit time discretization
  */
-template<class TypeTag, class Assembler>
-class CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/false>
-: public CCLocalAssemblerBase<TypeTag, Assembler,
-            CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>, false>
+template<class Assembler>
+class CCLocalAssembler<Assembler, DiffMethod::analytic, /*implicit=*/false>
+: public CCLocalAssemblerBase<Assembler,
+            CCLocalAssembler<Assembler, DiffMethod::analytic, false>, false>
 {
-    using ThisType = CCLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
-    using ParentType = CCLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
+    using ThisType = CCLocalAssembler<Assembler, DiffMethod::analytic, false>;
+    using ParentType = CCLocalAssemblerBase<Assembler, ThisType, false>;
 
     using JacobianMatrix = typename Assembler::JacobianMatrix;
     using GridVariables = typename Assembler::GridVariables;
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 7a8ba2f9a9..411ce12cd2 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -59,8 +59,8 @@ class FVAssembler
     static constexpr bool isBox = discMethod == DiscretizationMethod::box;
 
     using ThisType = FVAssembler<TypeTag, diffMethod, isImplicit>;
-    using LocalAssembler = std::conditional_t<isBox, BoxLocalAssembler<TypeTag, ThisType, diffMethod, isImplicit>,
-                                                     CCLocalAssembler<TypeTag, ThisType, diffMethod, isImplicit>>;
+    using LocalAssembler = std::conditional_t<isBox, BoxLocalAssembler<ThisType, diffMethod, isImplicit>,
+                                                     CCLocalAssembler<ThisType, diffMethod, isImplicit>>;
 
 public:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
diff --git a/dumux/assembly/fvlocalassemblerbase.hh b/dumux/assembly/fvlocalassemblerbase.hh
index be057fafac..dd680f5b36 100644
--- a/dumux/assembly/fvlocalassemblerbase.hh
+++ b/dumux/assembly/fvlocalassemblerbase.hh
@@ -37,12 +37,11 @@ namespace Dumux {
 /*!
  * \ingroup Assembly
  * \brief A base class for all local assemblers
- * \tparam TypeTag The TypeTag
  * \tparam Assembler The assembler type
  * \tparam Implementation The assembler implementation
  * \tparam useImplicitAssembly Specifies whether the time discretization is implicit or not not (i.e. explicit)
  */
-template<class TypeTag, class Assembler, class Implementation, bool useImplicitAssembly>
+template<class Assembler, class Implementation, bool useImplicitAssembly>
 class FVLocalAssemblerBase
 {
     using Problem = typename Assembler::Problem;
-- 
GitLab