Skip to content
Snippets Groups Projects
Commit cfb05cb6 authored by Kilian Weishaupt's avatar Kilian Weishaupt Committed by Dennis Gläser
Browse files

[localAssembly][cleanup] Remove unused aliases

parent ecbd279d
No related branches found
No related tags found
1 merge request!734Feature/improve fvassembler
...@@ -48,7 +48,6 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit> ...@@ -48,7 +48,6 @@ template<class TypeTag, class Assembler, class Implementation, bool implicit>
class BoxLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit> class BoxLocalAssemblerBase : public FVLocalAssemblerBase<TypeTag, Assembler, Implementation, implicit>
{ {
using ParentType = 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 JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables); using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector); using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
...@@ -181,11 +180,7 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr ...@@ -181,11 +180,7 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr
using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>; using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, true>;
using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>; using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, true>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); 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 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
...@@ -194,7 +189,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr ...@@ -194,7 +189,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tr
enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension };
static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache); static constexpr bool enableGridFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGridFluxVariablesCache);
static constexpr int maxNeighbors = 4*(2*dim);
public: public:
...@@ -305,11 +299,7 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa ...@@ -305,11 +299,7 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa
using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>; using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, false>;
using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>; using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, false>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); 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 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables); using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
...@@ -317,9 +307,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa ...@@ -317,9 +307,6 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fa
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { dim = GET_PROP_TYPE(TypeTag, GridView)::dimension }; 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: public:
using ParentType::ParentType; using ParentType::ParentType;
...@@ -421,22 +408,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/t ...@@ -421,22 +408,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/t
{ {
using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>; using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, true>;
using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); 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: public:
using ParentType::ParentType; using ParentType::ParentType;
...@@ -546,22 +520,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/f ...@@ -546,22 +520,9 @@ class BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, /*implicit=*/f
{ {
using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>; using ThisType = BoxLocalAssembler<TypeTag, Assembler, DiffMethod::analytic, false>;
using ParentType = BoxLocalAssemblerBase<TypeTag, Assembler, ThisType, 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); 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: public:
using ParentType::ParentType; using ParentType::ParentType;
......
...@@ -133,12 +133,8 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru ...@@ -133,12 +133,8 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/tru
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector); using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; 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 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
...@@ -300,13 +296,9 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal ...@@ -300,13 +296,9 @@ class CCLocalAssembler<TypeTag, Assembler, DiffMethod::numeric, /*implicit=*/fal
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector); using LocalResidualValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity; 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 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 GridVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables);
using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix); using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment