Commit 1681e00a authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

renamed path dune/amdis to amdis

parent 91f95d14
......@@ -8,13 +8,13 @@
#include <dune/istl/multitypeblockmatrix.hh>
#include <dune/istl/multitypeblockvector.hh>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/common/TupleUtility.hpp>
#include <dune/amdis/common/Utility.hpp>
#include <dune/amdis/linear_algebra/istl/DOFMatrix.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/TupleUtility.hpp>
#include <amdis/common/Utility.hpp>
#include <amdis/linear_algebra/istl/DOFMatrix.hpp>
// for explicit instantiation
#include <dune/amdis/ProblemStatTraits.hpp>
#include <amdis/ProblemStatTraits.hpp>
namespace AMDiS
{
......
#define AMDIS_NO_EXTERN_SYSTEMVECTOR
#include <dune/amdis/linear_algebra/istl/SystemVector.hpp>
#include <amdis/linear_algebra/istl/SystemVector.hpp>
#undef AMDIS_NO_EXTERN_SYSTEMVECTOR
......
......@@ -7,15 +7,15 @@
#include <dune/istl/multitypeblockvector.hh>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/common/Loops.hpp>
#include <dune/amdis/common/TupleUtility.hpp>
#include <dune/amdis/common/Utility.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/Loops.hpp>
#include <amdis/common/TupleUtility.hpp>
#include <amdis/common/Utility.hpp>
#include <dune/amdis/linear_algebra/istl/DOFVector.hpp>
#include <amdis/linear_algebra/istl/DOFVector.hpp>
// for explicit instantiation
#include <dune/amdis/ProblemStatTraits.hpp>
#include <amdis/ProblemStatTraits.hpp>
namespace AMDiS
{
......
......@@ -2,8 +2,8 @@
#include "itl/block_diagonal.hpp"
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
#include <amdis/CreatorMap.hpp>
#include <amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
namespace AMDiS
{
......
#pragma once
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/linear_algebra/mtl/ITL_Solver.hpp>
#include <amdis/CreatorMap.hpp>
#include <amdis/linear_algebra/mtl/ITL_Solver.hpp>
namespace AMDiS
{
......
......@@ -6,10 +6,10 @@
#include <boost/numeric/mtl/matrices.hpp>
#include <dune/amdis/common/Utility.hpp>
#include <dune/amdis/common/Literals.hpp>
#include <dune/amdis/common/Loops.hpp>
#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
#include <amdis/common/Utility.hpp>
#include <amdis/common/Literals.hpp>
#include <amdis/common/Loops.hpp>
#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
namespace AMDiS
{
......
......@@ -5,9 +5,9 @@
#include <boost/numeric/mtl/utility/irange.hpp>
#include <dune/amdis/common/Mpl.hpp>
#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
#include <dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp>
#include <amdis/common/Mpl.hpp>
#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
#include <amdis/linear_algebra/mtl/MTLDenseVector.hpp>
namespace AMDiS
{
......
......@@ -21,6 +21,6 @@ install(FILES
SystemMatrix.hpp
SystemVector.hpp
UmfpackRunner.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/amdis/linear_algebra/mtl)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/amdis/linear_algebra/mtl)
add_subdirectory("itl")
......@@ -2,13 +2,13 @@
#include <algorithm>
#include <dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp>
#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLVector.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <dune/amdis/linear_algebra/mtl/SystemVector.hpp>
#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
#include <amdis/linear_algebra/mtl/SystemVector.hpp>
#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
#include <dune/amdis/linear_algebra/mtl/Mapper.hpp>
#include <amdis/linear_algebra/mtl/Mapper.hpp>
namespace AMDiS
{
......
......@@ -15,8 +15,8 @@
#include <dune/common/reservedvector.hh>
#include <dune/functions/functionspacebases/flatmultiindex.hh>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/common/ClonablePtr.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/ClonablePtr.hpp>
namespace AMDiS
{
......
......@@ -8,11 +8,11 @@
#include <dune/functions/functionspacebases/flatmultiindex.hh>
#include <dune/functions/functionspacebases/interpolate.hh>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/common/ClonablePtr.hpp>
#include <dune/amdis/common/ScalarTypes.hpp>
#include <dune/amdis/linear_algebra/mtl/MTLDenseVector.hpp>
#include <dune/amdis/utility/MultiIndex.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/ClonablePtr.hpp>
#include <amdis/common/ScalarTypes.hpp>
#include <amdis/linear_algebra/mtl/MTLDenseVector.hpp>
#include <amdis/utility/MultiIndex.hpp>
namespace AMDiS
{
......
......@@ -8,10 +8,10 @@
#include <boost/numeric/itl/pc/ic_0.hpp>
#include <boost/numeric/mtl/vector/assigner.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/masslumping.hpp>
#include <amdis/linear_algebra/mtl/itl/masslumping.hpp>
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/linear_algebra/mtl/Preconditioner.hpp>
#include <amdis/CreatorMap.hpp>
#include <amdis/linear_algebra/mtl/Preconditioner.hpp>
namespace AMDiS
{
......
......@@ -18,19 +18,19 @@
// #include <boost/numeric/itl/krylov/tfqmr.hpp>
// more solvers defined in AMDiS
#include <dune/amdis/linear_algebra/mtl/itl/minres.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/gcr.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/fgmres.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/fgmres_householder.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/gmres2.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/gmres_householder.hpp>
#include <dune/amdis/linear_algebra/mtl/itl/preonly.hpp>
#include <dune/amdis/CreatorMap.hpp>
#include <dune/amdis/Initfile.hpp>
#include <dune/amdis/linear_algebra/mtl/LinearSolver.hpp>
#include <dune/amdis/linear_algebra/mtl/KrylovRunner.hpp>
#include <dune/amdis/linear_algebra/mtl/UmfpackRunner.hpp>
#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/CreatorMap.hpp>
#include <amdis/Initfile.hpp>
#include <amdis/linear_algebra/mtl/LinearSolver.hpp>
#include <amdis/linear_algebra/mtl/KrylovRunner.hpp>
#include <amdis/linear_algebra/mtl/UmfpackRunner.hpp>
namespace AMDiS
{
......
......@@ -9,12 +9,12 @@
#include <boost/numeric/mtl/mtl.hpp>
// AMDiS headers
#include <dune/amdis/linear_algebra/PreconditionerInterface.hpp>
#include <dune/amdis/linear_algebra/RunnerInterface.hpp>
#include <dune/amdis/linear_algebra/SolverInfo.hpp>
#include <amdis/linear_algebra/PreconditionerInterface.hpp>
#include <amdis/linear_algebra/RunnerInterface.hpp>
#include <amdis/linear_algebra/SolverInfo.hpp>
#include <dune/amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
#include <dune/amdis/linear_algebra/mtl/BITL_Preconditioner.hpp>
#include <amdis/linear_algebra/mtl/ITL_Preconditioner.hpp>
#include <amdis/linear_algebra/mtl/BITL_Preconditioner.hpp>
namespace AMDiS
{
......
......@@ -5,10 +5,10 @@
#include <dune/common/timer.hh>
// AMDiS includes
#include <dune/amdis/CreatorInterface.hpp>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/linear_algebra/LinearSolverInterface.hpp>
#include <dune/amdis/linear_algebra/mtl/BlockMTLVector.hpp>
#include <amdis/CreatorInterface.hpp>
#include <amdis/Output.hpp>
#include <amdis/linear_algebra/LinearSolverInterface.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLVector.hpp>
namespace AMDiS
{
......
......@@ -3,7 +3,7 @@
#include <boost/numeric/mtl/vector/dense_vector.hpp>
#include <dune/amdis/linear_algebra/LinearAlgebraBase.hpp>
#include <amdis/linear_algebra/LinearAlgebraBase.hpp>
namespace AMDiS
{
......
......@@ -4,8 +4,8 @@
#include <boost/numeric/mtl/matrix/mapped_inserter.hpp>
#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
namespace AMDiS
{
......
......@@ -2,7 +2,7 @@
#pragma once
#include <dune/amdis/linear_algebra/PreconditionerInterface.hpp>
#include <amdis/linear_algebra/PreconditionerInterface.hpp>
namespace AMDiS
{
......
#define AMDIS_NO_EXTERN_SYSTEMMATRIX
#include <dune/amdis/linear_algebra/mtl/SystemMatrix.hpp>
#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
#undef AMDIS_NO_EXTERN_SYSTEMMATRIX
......
......@@ -8,14 +8,14 @@
#include <boost/numeric/mtl/matrix/dense2D.hpp>
#include <boost/numeric/mtl/matrix/compressed2D.hpp>
#include <dune/amdis/Output.hpp>
#include <dune/amdis/common/TupleUtility.hpp>
#include <dune/amdis/common/Utility.hpp>
#include <dune/amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <dune/amdis/linear_algebra/mtl/DOFMatrix.hpp>
#include <amdis/Output.hpp>
#include <amdis/common/TupleUtility.hpp>
#include <amdis/common/Utility.hpp>
#include <amdis/linear_algebra/mtl/BlockMTLMatrix.hpp>
#include <amdis/linear_algebra/mtl/DOFMatrix.hpp>
// for explicit instantiation
#include <dune/amdis/ProblemStatTraits.hpp>
#include <amdis/ProblemStatTraits.hpp>
namespace AMDiS
{
......
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