diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh index fc677e49545f0625ca773e35533a5a4881f5a511..59857bd37f6025ebf5e2ad7acfd9977838ed6f54 100644 --- a/dumux/assembly/boxlocalassembler.hh +++ b/dumux/assembly/boxlocalassembler.hh @@ -48,7 +48,6 @@ 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 GridView = typename GET_PROP_TYPE(TypeTag, GridView); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); @@ -181,11 +180,7 @@ 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 = typename GET_PROP_TYPE(TypeTag, Scalar); - using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); @@ -194,7 +189,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); - static constexpr int maxNeighbors = 4*(2*dim); public: @@ -305,11 +299,7 @@ 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 = typename GET_PROP_TYPE(TypeTag, Scalar); - using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); @@ -317,9 +307,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; - static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); - static constexpr int maxNeighbors = 4*(2*dim); - public: using ParentType::ParentType; @@ -421,22 +408,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/t { using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>; using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>; - using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); - using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); - using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); - using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); - enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; - enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; - - static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); - static constexpr int maxNeighbors = 4*(2*dim); - public: using ParentType::ParentType; @@ -546,22 +520,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/f { using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>; using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>; - using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); - using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); - using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); - using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); - enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; - enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; - - static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); - static constexpr int maxNeighbors = 4*(2*dim); - public: using ParentType::ParentType; diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh index 85d8fe1383a893306b524d84e86cfb98d9b75805..dfa1fa20599a37eba702e4dbf6dd40972cd115ea 100644 --- a/dumux/assembly/cclocalassembler.hh +++ b/dumux/assembly/cclocalassembler.hh @@ -133,12 +133,8 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector); using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); - using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; @@ -300,13 +296,9 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector); using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; - using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector); - using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables); - using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); - using VolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };