diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc index c143be2ea1a5cd0cfef593a467a2ad8d8ad713b3..333e394a80bb2fa549791525df4bde1d69f6339e 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc +++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc @@ -35,7 +35,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/grid/gridmanager_sub.hh> @@ -174,7 +176,7 @@ int main(int argc, char** argv) couplingManager, timeLoop, oldSol); // the linear solver - using LinearSolver = ILU0BiCGSTABBackend; + using LinearSolver = ILUBiCGSTABIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/freeflowporenetwork/1p_1p/main.cc b/test/multidomain/boundary/freeflowporenetwork/1p_1p/main.cc index ac7c258ee4343b9ab82a10e3d227f1fb92211045..1e72342e1ae4b96b3da23dfcecf0783e4616b0be 100644 --- a/test/multidomain/boundary/freeflowporenetwork/1p_1p/main.cc +++ b/test/multidomain/boundary/freeflowporenetwork/1p_1p/main.cc @@ -41,7 +41,9 @@ #include <dumux/io/grid/porenetwork/gridmanager.hh> #include <dumux/io/vtk/intersectionwriter.hh> #include <dumux/io/vtkoutputmodule.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/porenetwork/common/boundaryflux.hh> #include <dumux/porenetwork/common/pnmvtkoutputmodule.hh> #include <dumux/multidomain/boundary/freeflowporenetwork/snappygridmanager.hh> @@ -175,7 +177,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // write vtk output diff --git a/test/multidomain/boundary/freeflowporousmedium/1p_1p/main.cc b/test/multidomain/boundary/freeflowporousmedium/1p_1p/main.cc index 9b06d2589312e4ae9543422498885d43761ffbf7..6f8ae756b6f04eef66cfd6e3c9444b89f7f264e9 100644 --- a/test/multidomain/boundary/freeflowporousmedium/1p_1p/main.cc +++ b/test/multidomain/boundary/freeflowporousmedium/1p_1p/main.cc @@ -34,7 +34,9 @@ #include <dumux/common/properties.hh> #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/assembly/diffmethod.hh> #include <dumux/discretization/method.hh> @@ -178,7 +180,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc index 525130a5bc8de5a483449abd955f89a36683aa85..92b4d6416fd51c8a0764c2d3bae1a96174048ad3 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/main.cc @@ -37,7 +37,9 @@ #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> #include <dumux/geometry/diameter.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -183,7 +185,7 @@ int main(int argc, char** argv) solOld); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc index 6369541bb913e36076c9fa9d40e52dc629682f29..2f392a88600c83f72dfe0caaa784df34efe4d2f7 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/main.cc @@ -36,7 +36,9 @@ #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> #include <dumux/geometry/diameter.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -170,7 +172,7 @@ int main(int argc, char** argv) solOld); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc index da5c5ab2b47fcb8adb78c91d2986b00711d35317..2b4b0a65ef925dc0351d5159c2ccc1feacc0c46d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc @@ -36,7 +36,9 @@ #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> #include <dumux/geometry/diameter.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -192,7 +194,7 @@ int main(int argc, char** argv) flux.addSurface("outlet", p0outlet, p1outlet); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc index dfcc36c2b5aa31a5bd8bd451fcd41df15bbc5a82..f4d3c86ba1de7a551865af0fc426f6a8a77fccab 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/main.cc @@ -36,7 +36,9 @@ #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> #include <dumux/geometry/diameter.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -170,7 +172,7 @@ int main(int argc, char** argv) solOld); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc index c5ebe048fba4ee1d1bd3d62f0362b9aacdfcc916..39ef7e1759fbabcf52304c0b4f39fb2adaf30bfd 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/convergencetest/main.cc @@ -34,7 +34,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -276,7 +278,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc index a79268b8fc30541000ac676e29df605843479592..7a0f34ddb44945a60e1f830341189fe5e20e6763 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/main.cc @@ -36,7 +36,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/partial.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/assembly/diffmethod.hh> #include <dumux/discretization/method.hh> @@ -148,7 +150,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc index 872ff5284b91b0f78499e8ccb49dd68530a0cf2d..8458a2cab74db1510b1b3bb3c20c052d775536ba 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc @@ -35,7 +35,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> #include <dumux/geometry/diameter.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/assembly/fvassembler.hh> #include <dumux/io/vtkoutputmodule.hh> #include <dumux/io/staggeredvtkoutputmodule.hh> @@ -167,7 +169,7 @@ int main(int argc, char** argv) timeLoop, solOld); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/facet/1p_1p/gravity/main.cc b/test/multidomain/facet/1p_1p/gravity/main.cc index d0aedeae7b718a8a7eaa90789515ea09ea94a2da..f139d5a338f4b59c990821ea28f7ea6cf593eeca 100644 --- a/test/multidomain/facet/1p_1p/gravity/main.cc +++ b/test/multidomain/facet/1p_1p/gravity/main.cc @@ -33,7 +33,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> @@ -155,7 +157,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = ILU0BiCGSTABBackend; + using LinearSolver = ILUBiCGSTABIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/facet/1p_1p/linearprofile/main.cc b/test/multidomain/facet/1p_1p/linearprofile/main.cc index 44650ea406a5004c18ed650072fd5c63ed805019..e5ccc364e95fb8e32a4c4ec7abbd5b6e4201e5e6 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/main.cc +++ b/test/multidomain/facet/1p_1p/linearprofile/main.cc @@ -32,7 +32,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> @@ -156,7 +158,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = ILU0BiCGSTABBackend; + using LinearSolver = ILUBiCGSTABIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc index 53a30e9d930a9d5cdf0f28cc7ed7733c9d35d2f3..6bc02d05245b35c4ae40eec2e0b56f51610820b0 100644 --- a/test/multidomain/facet/1p_1p/threedomain/main.cc +++ b/test/multidomain/facet/1p_1p/threedomain/main.cc @@ -33,7 +33,10 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> + #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> #include <dumux/multidomain/traits.hh> @@ -187,7 +190,7 @@ int main(int argc, char** argv) auto assembler = std::make_shared<Assembler>( problem.asTuple(), gridGeometry.asTuple(), gridVars.asTuple(), couplingManager); // the linear solver - using LinearSolver = ILU0BiCGSTABBackend; + using LinearSolver = ILUBiCGSTABIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/facet/1pnc_1pnc/main.cc b/test/multidomain/facet/1pnc_1pnc/main.cc index 7300c59764315167406697b934cedbbeb4f92294..9d885829efe2b64c4048e41cca32c35df73af203 100644 --- a/test/multidomain/facet/1pnc_1pnc/main.cc +++ b/test/multidomain/facet/1pnc_1pnc/main.cc @@ -32,7 +32,9 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> @@ -184,7 +186,7 @@ int main(int argc, char** argv) couplingManager, timeLoop, xOld); // the linear solver - using LinearSolver = ILU0BiCGSTABBackend; + using LinearSolver = ILUBiCGSTABIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/facet/tracer_tracer/main.cc b/test/multidomain/facet/tracer_tracer/main.cc index f8ec5ebb2e6576c38e88bac2b13f02505c269d04..d70253fa0a8e19638e1bf48bf07655a8808dd85a 100644 --- a/test/multidomain/facet/tracer_tracer/main.cc +++ b/test/multidomain/facet/tracer_tracer/main.cc @@ -37,7 +37,10 @@ #include <dumux/discretization/method.hh> #include <dumux/discretization/elementsolution.hh> #include <dumux/discretization/evalgradients.hh> -#include <dumux/linear/seqsolverbackend.hh> + +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> @@ -264,7 +267,7 @@ int main(int argc, char** argv) couplingManager); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver diff --git a/test/multidomain/poromechanics/el2p/main.cc b/test/multidomain/poromechanics/el2p/main.cc index b0d563fc166ad0ce7c15006b153df7634b522a5a..cdd2f1d4be80e58f0a63377103fd4da747fe7f44 100644 --- a/test/multidomain/poromechanics/el2p/main.cc +++ b/test/multidomain/poromechanics/el2p/main.cc @@ -33,7 +33,10 @@ #include <dumux/common/parameters.hh> #include <dumux/common/dumuxmessage.hh> -#include <dumux/linear/seqsolverbackend.hh> +#include <dumux/linear/istlsolvers.hh> +#include <dumux/linear/linearsolvertraits.hh> +#include <dumux/linear/linearalgebratraits.hh> + #include <dumux/multidomain/newtonsolver.hh> #include <dumux/multidomain/fvassembler.hh> #include <dumux/multidomain/traits.hh> @@ -155,7 +158,7 @@ int main(int argc, char** argv) couplingManager, timeLoop, xOld); // the linear solver - using LinearSolver = UMFPackBackend; + using LinearSolver = UMFPackIstlSolver<SeqLinearSolverTraits, LinearAlgebraTraitsFromAssembler<Assembler>>; auto linearSolver = std::make_shared<LinearSolver>(); // the non-linear solver