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

Cleanup of directory structure and removed obsolete files and functions

parent 0ef5f46a
......@@ -9,9 +9,9 @@
#include <amdis/CreatorMap.hpp>
#include <amdis/Initfile.hpp>
#include <amdis/linear_algebra/istl/Fwd.hpp>
#include <amdis/linear_algebra/istl/DirectRunner.hpp>
#include <amdis/linear_algebra/istl/ISTLRunner.hpp>
#include <amdis/linearalgebra/istl/Fwd.hpp>
#include <amdis/linearalgebra/istl/DirectRunner.hpp>
#include <amdis/linearalgebra/istl/ISTLRunner.hpp>
namespace AMDiS
{
......
......@@ -7,6 +7,6 @@ install(FILES
KrylovRunner.hpp
Preconditioner.hpp
UmfpackRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/mtl)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linearalgebra/mtl)
add_subdirectory("itl")
......@@ -7,8 +7,8 @@
#include <boost/numeric/mtl/utility/property_map.hpp>
#include <boost/numeric/mtl/utility/range_wrapper.hpp>
#include <amdis/linear_algebra/Common.hpp>
#include <amdis/linear_algebra/Constraints.hpp>
#include <amdis/linearalgebra/Common.hpp>
#include <amdis/linearalgebra/Constraints.hpp>
namespace AMDiS
{
......
......@@ -11,8 +11,8 @@
#include <boost/numeric/mtl/utility/range_wrapper.hpp>
#include <amdis/Output.hpp>
#include <amdis/linear_algebra/Common.hpp>
#include <amdis/linear_algebra/DOFMatrixBase.hpp>
#include <amdis/linearalgebra/Common.hpp>
#include <amdis/linearalgebra/DOFMatrixBase.hpp>
namespace AMDiS
{
......
......@@ -5,7 +5,7 @@
#include <dune/common/ftraits.hh>
#include <amdis/Output.hpp>
#include <amdis/linear_algebra/DOFVectorBase.hpp>
#include <amdis/linearalgebra/DOFVectorBase.hpp>
namespace AMDiS
{
......
......@@ -6,10 +6,10 @@
#include <boost/numeric/itl/pc/ic_0.hpp>
#include <boost/numeric/mtl/vector/assigner.hpp>
#include <amdis/linear_algebra/mtl/itl/masslumping.hpp>
#include <amdis/linearalgebra/mtl/itl/masslumping.hpp>
#include <amdis/CreatorMap.hpp>
#include <amdis/linear_algebra/mtl/Preconditioner.hpp>
#include <amdis/linearalgebra/mtl/Preconditioner.hpp>
namespace AMDiS
{
......
......@@ -6,19 +6,19 @@
#include <boost/numeric/itl/itl.hpp>
// more solvers defined in AMDiS
#include <amdis/linear_algebra/mtl/itl/minres.hpp>
#include <amdis/linear_algebra/mtl/itl/gcr.hpp>
#include <amdis/linear_algebra/mtl/itl/fgmres.hpp>
#include <amdis/linear_algebra/mtl/itl/fgmres_householder.hpp>
#include <amdis/linear_algebra/mtl/itl/gmres2.hpp>
#include <amdis/linear_algebra/mtl/itl/gmres_householder.hpp>
#include <amdis/linear_algebra/mtl/itl/preonly.hpp>
#include <amdis/linearalgebra/mtl/itl/minres.hpp>
#include <amdis/linearalgebra/mtl/itl/gcr.hpp>
#include <amdis/linearalgebra/mtl/itl/fgmres.hpp>
#include <amdis/linearalgebra/mtl/itl/fgmres_householder.hpp>
#include <amdis/linearalgebra/mtl/itl/gmres2.hpp>
#include <amdis/linearalgebra/mtl/itl/gmres_householder.hpp>
#include <amdis/linearalgebra/mtl/itl/preonly.hpp>
#include <amdis/CreatorMap.hpp>
#include <amdis/Initfile.hpp>
#include <amdis/linear_algebra/LinearSolver.hpp>
#include <amdis/linear_algebra/mtl/KrylovRunner.hpp>
#include <amdis/linear_algebra/mtl/UmfpackRunner.hpp>
#include <amdis/linearalgebra/LinearSolver.hpp>
#include <amdis/linearalgebra/mtl/KrylovRunner.hpp>
#include <amdis/linearalgebra/mtl/UmfpackRunner.hpp>
namespace AMDiS
{
......
......@@ -7,11 +7,11 @@
#include <boost/numeric/mtl/mtl.hpp>
// AMDiS headers
#include <amdis/linear_algebra/PreconditionerInterface.hpp>
#include <amdis/linear_algebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp>
#include <amdis/linearalgebra/PreconditionerInterface.hpp>
#include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linearalgebra/SolverInfo.hpp>
#include <amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
#include <amdis/linearalgebra/mtl/ITL_Preconditioner.hpp>
namespace AMDiS
{
......
#pragma once
#include <amdis/linear_algebra/PreconditionerInterface.hpp>
#include <amdis/linearalgebra/PreconditionerInterface.hpp>
namespace AMDiS
{
......
......@@ -9,8 +9,8 @@
#include <boost/numeric/mtl/interface/umfpack_solve.hpp>
#include <amdis/Output.hpp>
#include <amdis/linear_algebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp>
#include <amdis/linearalgebra/RunnerInterface.hpp>
#include <amdis/linearalgebra/SolverInfo.hpp>
namespace AMDiS
{
......
......@@ -11,4 +11,4 @@ install(FILES
minres.hpp
preonly.hpp
umfpack2_solve.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/mtl/itl)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linearalgebra/mtl/itl)
......@@ -2,7 +2,7 @@
#include <boost/numeric/itl/pc/diagonal.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <amdis/linearalgebra/mtl/BlockMTLMatrix.hpp>
namespace itl
{
......
......@@ -13,7 +13,7 @@
#ifndef ITL_PC_MASSLUMPING_INCLUDE
#define ITL_PC_MASSLUMPING_INCLUDE
#include <boost/numeric/linear_algebra/inverse.hpp>
#include <boost/numeric/linearalgebra/inverse.hpp>
#include <boost/numeric/mtl/vector/dense_vector.hpp>
#include <boost/numeric/mtl/utility/exception.hpp>
......
Supports Markdown
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