Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
cfb05cb6
Commit
cfb05cb6
authored
7 years ago
by
Kilian Weishaupt
Committed by
Dennis Gläser
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[localAssembly][cleanup] Remove unused aliases
parent
ecbd279d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!734
Feature/improve fvassembler
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dumux/assembly/boxlocalassembler.hh
+0
-39
0 additions, 39 deletions
dumux/assembly/boxlocalassembler.hh
dumux/assembly/cclocalassembler.hh
+0
-8
0 additions, 8 deletions
dumux/assembly/cclocalassembler.hh
with
0 additions
and
47 deletions
dumux/assembly/boxlocalassembler.hh
+
0
−
39
View file @
cfb05cb6
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
dumux/assembly/cclocalassembler.hh
+
0
−
8
View file @
cfb05cb6
...
@@ -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
)
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment