From 66e5620edff740ac1346257e26a6fdc1004e03dc Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 9 Mar 2020 16:07:11 +0100
Subject: [PATCH] [cleanup] Remove AMG deprecation warning
---
exercises/exercise-basic/2p2cmain.cc | 3 ++-
exercises/exercise-basic/2pmain.cc | 3 ++-
exercises/exercise-biomineralization/main.cc | 3 ++-
exercises/exercise-fluidsystem/main.cc | 3 ++-
exercises/exercise-grids/main.cc | 3 ++-
exercises/exercise-properties/main.cc | 3 ++-
exercises/exercise-runtimeparams/main.cc | 3 ++-
exercises/solution/exercise-basic/2pnimain.cc | 3 ++-
exercises/solution/exercise-biomineralization/main.cc | 3 ++-
exercises/solution/exercise-fluidsystem/main.cc | 3 ++-
exercises/solution/exercise-grids/main.cc | 3 ++-
exercises/solution/exercise-properties/main.cc | 3 ++-
exercises/solution/exercise-runtimeparams/main.cc | 3 ++-
13 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/exercises/exercise-basic/2p2cmain.cc b/exercises/exercise-basic/2p2cmain.cc
index 68c0a3ee..5ad81199 100644
--- a/exercises/exercise-basic/2p2cmain.cc
+++ b/exercises/exercise-basic/2p2cmain.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-basic/2pmain.cc b/exercises/exercise-basic/2pmain.cc
index a00ad7ad..3fe5018b 100644
--- a/exercises/exercise-basic/2pmain.cc
+++ b/exercises/exercise-basic/2pmain.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-biomineralization/main.cc b/exercises/exercise-biomineralization/main.cc
index c9b3513b..41aa7454 100644
--- a/exercises/exercise-biomineralization/main.cc
+++ b/exercises/exercise-biomineralization/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-fluidsystem/main.cc b/exercises/exercise-fluidsystem/main.cc
index baa1ea78..c35b4e68 100644
--- a/exercises/exercise-fluidsystem/main.cc
+++ b/exercises/exercise-fluidsystem/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-grids/main.cc b/exercises/exercise-grids/main.cc
index 90fc1fba..adf41083 100644
--- a/exercises/exercise-grids/main.cc
+++ b/exercises/exercise-grids/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-properties/main.cc b/exercises/exercise-properties/main.cc
index a0179621..91a44609 100644
--- a/exercises/exercise-properties/main.cc
+++ b/exercises/exercise-properties/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/exercise-runtimeparams/main.cc b/exercises/exercise-runtimeparams/main.cc
index 0919336e..30fa1f8b 100644
--- a/exercises/exercise-runtimeparams/main.cc
+++ b/exercises/exercise-runtimeparams/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-basic/2pnimain.cc b/exercises/solution/exercise-basic/2pnimain.cc
index 34eb43ca..d149b846 100644
--- a/exercises/solution/exercise-basic/2pnimain.cc
+++ b/exercises/solution/exercise-basic/2pnimain.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-biomineralization/main.cc b/exercises/solution/exercise-biomineralization/main.cc
index c9b3513b..41aa7454 100644
--- a/exercises/solution/exercise-biomineralization/main.cc
+++ b/exercises/solution/exercise-biomineralization/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-fluidsystem/main.cc b/exercises/solution/exercise-fluidsystem/main.cc
index 571e0451..23e72785 100644
--- a/exercises/solution/exercise-fluidsystem/main.cc
+++ b/exercises/solution/exercise-fluidsystem/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-grids/main.cc b/exercises/solution/exercise-grids/main.cc
index 62e20adf..2810e5b5 100644
--- a/exercises/solution/exercise-grids/main.cc
+++ b/exercises/solution/exercise-grids/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-properties/main.cc b/exercises/solution/exercise-properties/main.cc
index df4d8a75..4510c447 100644
--- a/exercises/solution/exercise-properties/main.cc
+++ b/exercises/solution/exercise-properties/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
diff --git a/exercises/solution/exercise-runtimeparams/main.cc b/exercises/solution/exercise-runtimeparams/main.cc
index 0919336e..30fa1f8b 100644
--- a/exercises/solution/exercise-runtimeparams/main.cc
+++ b/exercises/solution/exercise-runtimeparams/main.cc
@@ -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 = AMGBackend<TypeTag>;
+ using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<FVGridGeometry>>;
auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
// the non-linear solver
--
GitLab