Am Montag, 13. Mai 2022, finden Wartungsarbeiten am Gitlab-Server (Update auf neue Version statt). Der Dienst wird daher am Montag für einige Zeit nicht verfügbar sein.
On Monday, May 13th 2022, the Gitlab server will be updated. The service will therefore not be accessible for some time on Monday.

Commit f688bc11 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Cleanup of directory structure and removed obsolete files and functions

parent 0ef5f46a
#pragma once #pragma once
#include <amdis/common/Utility.hpp> #include <amdis/common/TypeTraits.hpp>
#include <amdis/linear_algebra/PreconditionerInterface.hpp> #include <amdis/linearalgebra/PreconditionerInterface.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -7,4 +7,4 @@ install(FILES ...@@ -7,4 +7,4 @@ install(FILES
PreconConfig.hpp PreconConfig.hpp
SolverConfig.hpp SolverConfig.hpp
SolverCreator.hpp SolverCreator.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/eigen) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linearalgebra/eigen)
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include <Eigen/SparseCore> #include <Eigen/SparseCore>
#include <amdis/common/Mpl.hpp> #include <amdis/common/Mpl.hpp>
#include <amdis/linear_algebra/Common.hpp> #include <amdis/linearalgebra/Common.hpp>
#include <amdis/linear_algebra/Constraints.hpp> #include <amdis/linearalgebra/Constraints.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <dune/common/timer.hh> #include <dune/common/timer.hh>
#include <amdis/Output.hpp> #include <amdis/Output.hpp>
#include <amdis/linear_algebra/Common.hpp> #include <amdis/linearalgebra/Common.hpp>
#include <amdis/linear_algebra/DOFMatrixBase.hpp> #include <amdis/linearalgebra/DOFMatrixBase.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <dune/common/ftraits.hh> #include <dune/common/ftraits.hh>
#include <amdis/Output.hpp> #include <amdis/Output.hpp>
#include <amdis/linear_algebra/DOFVectorBase.hpp> #include <amdis/linearalgebra/DOFVectorBase.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <amdis/linear_algebra/RunnerInterface.hpp> #include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp> #include <amdis/linearalgebra/SolverInfo.hpp>
#include <amdis/linear_algebra/eigen/SolverConfig.hpp> #include <amdis/linearalgebra/eigen/SolverConfig.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#include <dune/istl/preconditioner.hh> #include <dune/istl/preconditioner.hh>
#include <amdis/linear_algebra/RunnerInterface.hpp> #include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp> #include <amdis/linearalgebra/SolverInfo.hpp>
#include <amdis/linear_algebra/eigen/PreconConfig.hpp> #include <amdis/linearalgebra/eigen/PreconConfig.hpp>
#include <amdis/linear_algebra/eigen/SolverConfig.hpp> #include <amdis/linearalgebra/eigen/SolverConfig.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include <amdis/CreatorMap.hpp> #include <amdis/CreatorMap.hpp>
#include <amdis/Initfile.hpp> #include <amdis/Initfile.hpp>
#include <amdis/linear_algebra/LinearSolver.hpp> #include <amdis/linearalgebra/LinearSolver.hpp>
#include <amdis/linear_algebra/eigen/DirectRunner.hpp> #include <amdis/linearalgebra/eigen/DirectRunner.hpp>
#include <amdis/linear_algebra/eigen/IterativeRunner.hpp> #include <amdis/linearalgebra/eigen/IterativeRunner.hpp>
namespace AMDiS namespace AMDiS
{ {
...@@ -30,7 +30,7 @@ namespace AMDiS ...@@ -30,7 +30,7 @@ namespace AMDiS
using SolverBase = LinearSolverInterface<Matrix, VectorX, VectorB>; using SolverBase = LinearSolverInterface<Matrix, VectorX, VectorB>;
using Scalar = typename Matrix::Scalar; using Scalar = typename Matrix::Scalar;
virtual std::unique_ptr<SolverBase> create(std::string prefix) override virtual std::unique_ptr<SolverBase> createWithString(std::string const& prefix) override
{ {
// get creator string for preconditioner // get creator string for preconditioner
std::string precon = "no"; std::string precon = "no";
......
...@@ -7,4 +7,4 @@ install(FILES ...@@ -7,4 +7,4 @@ install(FILES
ISTL_Preconditioner.hpp ISTL_Preconditioner.hpp
ISTL_Solver.hpp ISTL_Solver.hpp
ISTLRunner.hpp ISTLRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/istl) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linearalgebra/istl)
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
#include <amdis/linear_algebra/Common.hpp> #include <amdis/linearalgebra/Common.hpp>
#include <amdis/linear_algebra/Constraints.hpp> #include <amdis/linearalgebra/Constraints.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <dune/istl/matrixindexset.hh> #include <dune/istl/matrixindexset.hh>
#include <amdis/Output.hpp> #include <amdis/Output.hpp>
#include <amdis/linear_algebra/Common.hpp> #include <amdis/linearalgebra/Common.hpp>
#include <amdis/linear_algebra/DOFMatrixBase.hpp> #include <amdis/linearalgebra/DOFMatrixBase.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <amdis/Output.hpp> #include <amdis/Output.hpp>
#include <amdis/linear_algebra/DOFVectorBase.hpp> #include <amdis/linearalgebra/DOFVectorBase.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <string> #include <string>
#include <amdis/Output.hpp> #include <amdis/Output.hpp>
#include <amdis/linear_algebra/RunnerInterface.hpp> #include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp> #include <amdis/linearalgebra/SolverInfo.hpp>
namespace AMDiS namespace AMDiS
{ {
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
#include <dune/istl/preconditioner.hh> #include <dune/istl/preconditioner.hh>
#include <amdis/linear_algebra/RunnerInterface.hpp> #include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp> #include <amdis/linearalgebra/SolverInfo.hpp>
#include <amdis/linear_algebra/istl/Fwd.hpp> #include <amdis/linearalgebra/istl/Fwd.hpp>
#include <amdis/linear_algebra/istl/ISTL_Preconditioner.hpp> #include <amdis/linearalgebra/istl/ISTL_Preconditioner.hpp>
namespace AMDiS namespace AMDiS
{ {
...@@ -76,7 +76,7 @@ namespace AMDiS ...@@ -76,7 +76,7 @@ namespace AMDiS
preconName = "default"; preconName = "default";
auto* creator = named(CreatorMap<ISTLPrecon>::getCreator(preconName, initFileStr)); auto* creator = named(CreatorMap<ISTLPrecon>::getCreator(preconName, initFileStr));
preconCreator_ = creator->create(initFileStr); preconCreator_ = creator->createWithString(initFileStr);
assert(preconCreator_); assert(preconCreator_);
} }
......
...@@ -30,7 +30,7 @@ namespace AMDiS ...@@ -30,7 +30,7 @@ namespace AMDiS
struct Creator : CreatorInterfaceName<Super> struct Creator : CreatorInterfaceName<Super>
{ {
virtual std::unique_ptr<Super> create(std::string prefix) override virtual std::unique_ptr<Super> createWithString(std::string prefix) override
{ {
return std::make_unique<Self>(prefix); return std::make_unique<Self>(prefix);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment