Skip to content
GitLab
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
2c496ddf
Commit
2c496ddf
authored
Mar 10, 2020
by
Simon Emmert
Browse files
Merge branch 'cleanup/remove-amgbackend-deprecation-warning' into 'master'
[cleanup] Remove AMG deprecation warning See merge request
!82
parents
4567c93b
66e5620e
Pipeline
#1774
failed with stage
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
exercises/exercise-basic/2p2cmain.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/dumuxmessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -123,7 +124,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-basic/2pmain.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -127,7 +128,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-biomineralization/main.cc
View file @
2c496ddf
...
...
@@ -39,6 +39,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -133,7 +134,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-fluidsystem/main.cc
View file @
2c496ddf
...
...
@@ -42,6 +42,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -131,7 +132,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-grids/main.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -125,7 +126,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-properties/main.cc
View file @
2c496ddf
...
...
@@ -41,6 +41,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -154,7 +155,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/exercise-runtimeparams/main.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -125,7 +126,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-basic/2pnimain.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -123,7 +124,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-biomineralization/main.cc
View file @
2c496ddf
...
...
@@ -39,6 +39,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -133,7 +134,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-fluidsystem/main.cc
View file @
2c496ddf
...
...
@@ -42,6 +42,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -128,7 +129,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-grids/main.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -125,7 +126,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-properties/main.cc
View file @
2c496ddf
...
...
@@ -41,6 +41,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -155,7 +156,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
exercises/solution/exercise-runtimeparams/main.cc
View file @
2c496ddf
...
...
@@ -36,6 +36,7 @@
#include
<dumux/common/defaultusagemessage.hh>
#include
<dumux/linear/amgbackend.hh>
#include
<dumux/linear/linearsolvertraits.hh>
#include
<dumux/nonlinear/newtonsolver.hh>
#include
<dumux/assembly/fvassembler.hh>
...
...
@@ -125,7 +126,7 @@ int main(int argc, char** argv) try
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvGridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGB
ackend
<
TypeTag
>
;
using
LinearSolver
=
AMGB
iCGSTABBackend
<
LinearSolverTraits
<
FVGridGeometry
>
>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvGridGeometry
->
dofMapper
());
// the non-linear solver
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment