Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux-course
Commits
357a508b
Commit
357a508b
authored
Sep 01, 2020
by
Roman Winter
Browse files
[cleanup] deprecation warnings and errors
parent
d62da77c
Changes
55
Hide whitespace changes
Inline
Side-by-side
exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
View file @
357a508b
...
@@ -178,7 +178,7 @@ int main(int argc, char** argv) try
...
@@ -178,7 +178,7 @@ int main(int argc, char** argv) try
stokesGridVariables
->
cellCenterGridVariablesPtr
(),
stokesGridVariables
->
cellCenterGridVariablesPtr
(),
darcyGridVariables
),
darcyGridVariables
),
couplingManager
,
couplingManager
,
timeLoop
);
timeLoop
,
solOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
UMFPackBackend
;
using
LinearSolver
=
UMFPackBackend
;
...
...
exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
View file @
357a508b
...
@@ -42,7 +42,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
...
@@ -42,7 +42,7 @@ class PorousMediumSubProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
VolumeVariables
=
GetPropType
<
TypeTag
,
Properties
::
VolumeVariables
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
exercises/solution/exercise-fluidsystem/2p2cproblem.hh
View file @
357a508b
...
@@ -52,7 +52,7 @@ class ExerciseFluidsystemProblemTwoPTwoC : public PorousMediumFlowProblem<TypeTa
...
@@ -52,7 +52,7 @@ class ExerciseFluidsystemProblemTwoPTwoC : public PorousMediumFlowProblem<TypeTa
// Dumux specific types
// Dumux specific types
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/solution/exercise-fluidsystem/2pproblem.hh
View file @
357a508b
...
@@ -58,7 +58,7 @@ class ExerciseFluidsystemProblemTwoP : public PorousMediumFlowProblem<TypeTag>
...
@@ -58,7 +58,7 @@ class ExerciseFluidsystemProblemTwoP : public PorousMediumFlowProblem<TypeTag>
// Dumux specific types
// Dumux specific types
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/solution/exercise-fluidsystem/main.cc
View file @
357a508b
...
@@ -125,7 +125,7 @@ int main(int argc, char** argv) try
...
@@ -125,7 +125,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
,
/*implicit?*/
true
>
;
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
,
/*implicit?*/
true
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
exercises/solution/exercise-fractures/fractureproblem.hh
View file @
357a508b
...
@@ -43,7 +43,7 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
...
@@ -43,7 +43,7 @@ class FractureSubProblem : public PorousMediumFlowProblem<TypeTag>
{
{
using
ParentType
=
PorousMediumFlowProblem
<
TypeTag
>
;
using
ParentType
=
PorousMediumFlowProblem
<
TypeTag
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
CouplingManager
=
GetPropType
<
TypeTag
,
Properties
::
CouplingManager
>
;
using
CouplingManager
=
GetPropType
<
TypeTag
,
Properties
::
CouplingManager
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
...
...
exercises/solution/exercise-fractures/main.cc
View file @
357a508b
...
@@ -220,7 +220,7 @@ int main(int argc, char** argv) try
...
@@ -220,7 +220,7 @@ int main(int argc, char** argv) try
std
::
make_tuple
(
matrixFvGridGeometry
,
fractureFvGridGeometry
),
std
::
make_tuple
(
matrixFvGridGeometry
,
fractureFvGridGeometry
),
std
::
make_tuple
(
matrixGridVariables
,
fractureGridVariables
),
std
::
make_tuple
(
matrixGridVariables
,
fractureGridVariables
),
couplingManager
,
couplingManager
,
timeLoop
);
timeLoop
,
xOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
ILU0BiCGSTABBackend
;
using
LinearSolver
=
ILU0BiCGSTABBackend
;
...
...
exercises/solution/exercise-fractures/matrixproblem.hh
View file @
357a508b
...
@@ -47,7 +47,7 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
...
@@ -47,7 +47,7 @@ class MatrixSubProblem : public PorousMediumFlowProblem<TypeTag>
{
{
using
ParentType
=
PorousMediumFlowProblem
<
TypeTag
>
;
using
ParentType
=
PorousMediumFlowProblem
<
TypeTag
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
CouplingManager
=
GetPropType
<
TypeTag
,
Properties
::
CouplingManager
>
;
using
CouplingManager
=
GetPropType
<
TypeTag
,
Properties
::
CouplingManager
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
...
...
exercises/solution/exercise-grids/main.cc
View file @
357a508b
...
@@ -123,7 +123,7 @@ int main(int argc, char** argv) try
...
@@ -123,7 +123,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
exercises/solution/exercise-grids/problem.hh
View file @
357a508b
...
@@ -59,7 +59,7 @@ class InjectionProblem2P : public PorousMediumFlowProblem<TypeTag>
...
@@ -59,7 +59,7 @@ class InjectionProblem2P : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/solution/exercise-mainfile/1pproblem.hh
View file @
357a508b
...
@@ -45,7 +45,7 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
...
@@ -45,7 +45,7 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
static
constexpr
int
dimWorld
=
GridView
::
dimensionworld
;
static
constexpr
int
dimWorld
=
GridView
::
dimensionworld
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
exercises/solution/exercise-properties/main.cc
View file @
357a508b
...
@@ -152,7 +152,7 @@ int main(int argc, char** argv) try
...
@@ -152,7 +152,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
exercises/solution/exercise-properties/problem.hh
View file @
357a508b
...
@@ -43,7 +43,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
...
@@ -43,7 +43,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
GlobalPosition
=
typename
Element
::
Geometry
::
GlobalCoordinate
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
NumEqVector
=
GetPropType
<
TypeTag
,
Properties
::
NumEqVector
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
...
...
exercises/solution/exercise-runtimeparams/main.cc
View file @
357a508b
...
@@ -123,7 +123,7 @@ int main(int argc, char** argv) try
...
@@ -123,7 +123,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
,
xOld
);
// the linear solver
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>>
;
...
...
exercises/solution/exercise-runtimeparams/problem.hh
View file @
357a508b
...
@@ -59,7 +59,7 @@ class InjectionProblem2P : public PorousMediumFlowProblem<TypeTag>
...
@@ -59,7 +59,7 @@ class InjectionProblem2P : public PorousMediumFlowProblem<TypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
Indices
=
typename
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
Indices
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
PrimaryVariables
=
GetPropType
<
TypeTag
,
Properties
::
PrimaryVariables
>
;
using
BoundaryTypes
=
GetPropType
<
TypeTag
,
Properties
::
BoundaryTypes
>
;
using
BoundaryTypes
=
Dumux
::
BoundaryTypes
<
GetPropType
<
TypeTag
,
Properties
::
ModelTraits
>::
numEq
()
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVGridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
using
FluidSystem
=
GetPropType
<
TypeTag
,
Properties
::
FluidSystem
>
;
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment