From 8df59fafc61a15c9a4938ae92060e3572c868ff7 Mon Sep 17 00:00:00 2001 From: Simon Praetorius Date: Sun, 18 Jul 2021 14:08:31 +0200 Subject: [PATCH] Renamed Solvers.hpp into DefaultSolvers.hpp and Preconditioners.hpp into DefaultPreconditioners.hpp --- amdis/LinearAlgebra.hpp | 4 ++-- amdis/linearalgebra/istl/CMakeLists.txt | 8 ++++---- .../{Preconditioners.cpp => DefaultPreconditioners.cpp} | 4 ++-- .../{Preconditioners.hpp => DefaultPreconditioners.hpp} | 0 .../istl/{Solvers.cpp => DefaultSolvers.cpp} | 4 ++-- .../istl/{Solvers.hpp => DefaultSolvers.hpp} | 0 amdis/linearalgebra/istl/LinearSolver.hpp | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename amdis/linearalgebra/istl/{Preconditioners.cpp => DefaultPreconditioners.cpp} (73%) rename amdis/linearalgebra/istl/{Preconditioners.hpp => DefaultPreconditioners.hpp} (100%) rename amdis/linearalgebra/istl/{Solvers.cpp => DefaultSolvers.cpp} (72%) rename amdis/linearalgebra/istl/{Solvers.hpp => DefaultSolvers.hpp} (100%) diff --git a/amdis/LinearAlgebra.hpp b/amdis/LinearAlgebra.hpp index 076f650c..07dd3b31 100644 --- a/amdis/LinearAlgebra.hpp +++ b/amdis/LinearAlgebra.hpp @@ -33,9 +33,9 @@ #elif AMDIS_BACKEND == AMDIS_BACKEND_ISTL #include +#include +#include #include -#include -#include #include #include #include diff --git a/amdis/linearalgebra/istl/CMakeLists.txt b/amdis/linearalgebra/istl/CMakeLists.txt index a86762ff..316fb40e 100644 --- a/amdis/linearalgebra/istl/CMakeLists.txt +++ b/amdis/linearalgebra/istl/CMakeLists.txt @@ -1,6 +1,6 @@ target_sources(amdis PRIVATE - Preconditioners.cpp - Solvers.cpp) + DefaultPreconditioners.cpp + DefaultSolvers.cpp) install(FILES AMGPrecon.hpp @@ -8,14 +8,14 @@ install(FILES Communication.inc.hpp Constraints.hpp Creators.hpp + DefaultPreconditioners.hpp + DefaultSolvers.hpp ISTLPreconCreator.hpp ISTLSolverCreator.hpp LinearSolver.hpp MatrixBackend.hpp Operations.hpp - Preconditioners.hpp PreconWrapper.hpp - Solvers.hpp SolverWrapper.hpp Traits.hpp VectorBackend.hpp diff --git a/amdis/linearalgebra/istl/Preconditioners.cpp b/amdis/linearalgebra/istl/DefaultPreconditioners.cpp similarity index 73% rename from amdis/linearalgebra/istl/Preconditioners.cpp rename to amdis/linearalgebra/istl/DefaultPreconditioners.cpp index 48aee837..87b08e5e 100644 --- a/amdis/linearalgebra/istl/Preconditioners.cpp +++ b/amdis/linearalgebra/istl/DefaultPreconditioners.cpp @@ -1,7 +1,7 @@ #include -#include "Preconditioners.hpp" -#include "Solvers.hpp" +#include "DefaultPreconditioners.hpp" +#include "DefaultSolvers.hpp" namespace AMDiS { diff --git a/amdis/linearalgebra/istl/Preconditioners.hpp b/amdis/linearalgebra/istl/DefaultPreconditioners.hpp similarity index 100% rename from amdis/linearalgebra/istl/Preconditioners.hpp rename to amdis/linearalgebra/istl/DefaultPreconditioners.hpp diff --git a/amdis/linearalgebra/istl/Solvers.cpp b/amdis/linearalgebra/istl/DefaultSolvers.cpp similarity index 72% rename from amdis/linearalgebra/istl/Solvers.cpp rename to amdis/linearalgebra/istl/DefaultSolvers.cpp index 7804e453..93b31dd7 100644 --- a/amdis/linearalgebra/istl/Solvers.cpp +++ b/amdis/linearalgebra/istl/DefaultSolvers.cpp @@ -1,7 +1,7 @@ #include -#include "Preconditioners.hpp" -#include "Solvers.hpp" +#include "DefaultPreconditioners.hpp" +#include "DefaultSolvers.hpp" namespace AMDiS { diff --git a/amdis/linearalgebra/istl/Solvers.hpp b/amdis/linearalgebra/istl/DefaultSolvers.hpp similarity index 100% rename from amdis/linearalgebra/istl/Solvers.hpp rename to amdis/linearalgebra/istl/DefaultSolvers.hpp diff --git a/amdis/linearalgebra/istl/LinearSolver.hpp b/amdis/linearalgebra/istl/LinearSolver.hpp index 54a7b6c9..fb8ef6f8 100644 --- a/amdis/linearalgebra/istl/LinearSolver.hpp +++ b/amdis/linearalgebra/istl/LinearSolver.hpp @@ -3,9 +3,9 @@ #include #include +#include +#include #include -#include -#include #include namespace AMDiS -- GitLab