renamed path dune/amdis to amdis

dune/amdis/FiniteElementSpaces.hpp → src/amdis/FiniteElementSpaces.hpp

 #pragma once
 
-#include <dune/amdis/common/TupleUtility.hpp>
-#include <dune/amdis/common/IndexSeq.hpp>
-#include <dune/amdis/common/Loops.hpp>
+#include <amdis/common/TupleUtility.hpp>
+#include <amdis/common/IndexSeq.hpp>
+#include <amdis/common/Loops.hpp>
 
 namespace AMDiS
 {

dune/amdis/GridFunctionOperator.hpp → src/amdis/GridFunctionOperator.hpp

@@ -3,9 +3,9 @@
 #include <cassert>
 #include <type_traits>
 
-#include <dune/amdis/GridFunctions.hpp>
-#include <dune/amdis/common/Utility.hpp>
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/GridFunctions.hpp>
+#include <amdis/common/Utility.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 
 namespace AMDiS
 {

dune/amdis/GridFunctions.hpp → src/amdis/GridFunctions.hpp

@@ -61,12 +61,12 @@
   *   + `auto value1 = integrate(sin(X(0)), 4);`
   **/
 
-#include <dune/amdis/gridfunctions/AnalyticGridFunction.hpp>
-#include <dune/amdis/gridfunctions/ConstantGridFunction.hpp>
-#include <dune/amdis/gridfunctions/CoordsGridFunction.hpp>
-#include <dune/amdis/gridfunctions/DerivativeGridFunction.hpp>
-#include <dune/amdis/gridfunctions/FunctorGridFunction.hpp>
-#include <dune/amdis/gridfunctions/OperationsGridFunction.hpp>
+#include <amdis/gridfunctions/AnalyticGridFunction.hpp>
+#include <amdis/gridfunctions/ConstantGridFunction.hpp>
+#include <amdis/gridfunctions/CoordsGridFunction.hpp>
+#include <amdis/gridfunctions/DerivativeGridFunction.hpp>
+#include <amdis/gridfunctions/FunctorGridFunction.hpp>
+#include <amdis/gridfunctions/OperationsGridFunction.hpp>
 
 namespace AMDiS
 {

dune/amdis/Initfile.cpp → src/amdis/Initfile.cpp

-#include <dune/amdis/Initfile.hpp>
+#include <amdis/Initfile.hpp>
 
-#include <dune/amdis/InitfileParser.hpp>
+#include <amdis/InitfileParser.hpp>
 
 // a parser for arithmetic expressions
 // #include <muParser.h>

dune/amdis/InitfileParser.cpp → src/amdis/InitfileParser.cpp

-#include <dune/amdis/InitfileParser.hpp>
+#include <amdis/InitfileParser.hpp>
 
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
-#include <dune/amdis/utility/String.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/utility/Filesystem.hpp>
+#include <amdis/utility/String.hpp>
 
 namespace AMDiS {
 

src/amdis/LinearAlgebra.hpp

+#pragma once
+
+#include <amdis/linear_algebra/LinearSolverInterface.hpp>
+#include <amdis/linear_algebra/SolverInfo.hpp>
+
+#if defined(AMDIS_BACKEND_ISTL)
+
+#include <amdis/linear_algebra/istl/SystemVector.hpp>
+#include <amdis/linear_algebra/istl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/istl/LinearSolver.hpp>
+
+#elif defined(AMDIS_BACKEND_MTL)
+
+#include <amdis/linear_algebra/mtl/SystemVector.hpp>
+#include <amdis/linear_algebra/mtl/SystemMatrix.hpp>
+#include <amdis/linear_algebra/mtl/LinearSolver.hpp>
+#include <amdis/linear_algebra/mtl/ITL_Solver.hpp>
+#include <amdis/linear_algebra/mtl/BITL_Solver.hpp>
+
+#elif defined(AMDIS_BACKEND_PETSC)
+
+#include <amdis/linear_algebra/petsc/SystemVector.hpp>
+#include <amdis/linear_algebra/petsc/SystemMatrix.hpp>
+#include <amdis/linear_algebra/petsc/LinearSolver.hpp>
+
+#else
+
+#error "Unknown linear algebra backend!. Set corresponding variable \
+        AMDIS_BACKEND_ISTL, AMDIS_BACKEND_MTL or AMDIS_BACKEND_PETSC."
+
+#endif
\ No newline at end of file

dune/amdis/LocalAssembler.hpp → src/amdis/LocalAssembler.hpp

@@ -6,10 +6,10 @@
 
 #include <dune/geometry/quadraturerules.hh>
 
-#include <dune/amdis/ContextGeometry.hpp>
-#include <dune/amdis/LocalAssemblerBase.hpp>
-#include <dune/amdis/common/Concepts.hpp>
-#include <dune/amdis/utility/FiniteElementType.hpp>
+#include <amdis/ContextGeometry.hpp>
+#include <amdis/LocalAssemblerBase.hpp>
+#include <amdis/common/Concepts.hpp>
+#include <amdis/utility/FiniteElementType.hpp>
 
 namespace AMDiS
 {

dune/amdis/LocalAssemblerBase.hpp → src/amdis/LocalAssemblerBase.hpp

@@ -4,9 +4,9 @@
 #include <memory>
 #include <type_traits>
 
-#include <dune/amdis/common/ConceptsBase.hpp>
-#include <dune/amdis/common/TypeDefs.hpp>
-#include <dune/amdis/utility/TreeData.hpp>
+#include <amdis/common/ConceptsBase.hpp>
+#include <amdis/common/TypeDefs.hpp>
+#include <amdis/utility/TreeData.hpp>
 
 namespace AMDiS
 {

dune/amdis/Mesh.hpp → src/amdis/Mesh.hpp

@@ -14,9 +14,9 @@
 #include <dune/grid/albertagrid/albertareader.hh>
 #include <dune/grid/io/file/gmshreader.hh>
 
-#include <dune/amdis/Initfile.hpp>
-#include <dune/amdis/Output.hpp>
-#include <dune/amdis/utility/Filesystem.hpp>
+#include <amdis/Initfile.hpp>
+#include <amdis/Output.hpp>
+#include <amdis/utility/Filesystem.hpp>
 
 namespace AMDiS
 {

dune/amdis/Operations.hpp → src/amdis/Operations.hpp

@@ -10,9 +10,9 @@
   * derivatives w.r.t. the functor arguments.
   **/
 
-#include <dune/amdis/operations/Arithmetic.hpp>
-#include <dune/amdis/operations/Basic.hpp>
-#include <dune/amdis/operations/CMath.hpp>
-#include <dune/amdis/operations/Composer.hpp>
-#include <dune/amdis/operations/FieldMatVec.hpp>
-#include <dune/amdis/operations/MaxMin.hpp>
+#include <amdis/operations/Arithmetic.hpp>
+#include <amdis/operations/Basic.hpp>
+#include <amdis/operations/CMath.hpp>
+#include <amdis/operations/Composer.hpp>
+#include <amdis/operations/FieldMatVec.hpp>
+#include <amdis/operations/MaxMin.hpp>

dune/amdis/Operators.hpp → src/amdis/Operators.hpp

 #pragma once
 
-#include <dune/amdis/LocalAssembler.hpp>
-#include <dune/amdis/GridFunctionOperator.hpp>
+#include <amdis/LocalAssembler.hpp>
+#include <amdis/GridFunctionOperator.hpp>
 
 /*
  * In the following comments we use the notation
@@ -38,25 +38,25 @@
   **/
 
 // zero-order operators
-#include <dune/amdis/assembler/ZeroOrderTest.hpp>             // <psi * c>
-#include <dune/amdis/assembler/ZeroOrderTestTrial.hpp>        // <psi, c * phi>
-#include <dune/amdis/assembler/ZeroOrderTestTrialvec.hpp>     // <psi, b * Phi>
-#include <dune/amdis/assembler/ZeroOrderTestvec.hpp>          // <Psi * b>
-#include <dune/amdis/assembler/ZeroOrderTestvecTrial.hpp>     // <Psi, b * phi>
-#include <dune/amdis/assembler/ZeroOrderTestvecTrialvec.hpp>  // <Psi, A * Phi>, <Psi, c * Phi>
+#include <amdis/assembler/ZeroOrderTest.hpp>             // <psi * c>
+#include <amdis/assembler/ZeroOrderTestTrial.hpp>        // <psi, c * phi>
+#include <amdis/assembler/ZeroOrderTestTrialvec.hpp>     // <psi, b * Phi>
+#include <amdis/assembler/ZeroOrderTestvec.hpp>          // <Psi * b>
+#include <amdis/assembler/ZeroOrderTestvecTrial.hpp>     // <Psi, b * phi>
+#include <amdis/assembler/ZeroOrderTestvecTrialvec.hpp>  // <Psi, A * Phi>, <Psi, c * Phi>
 
 // first-order operators
-#include <dune/amdis/assembler/FirstOrderDivTestvecTrial.hpp>   // <div(Psi), c * phi>
-#include <dune/amdis/assembler/FirstOrderGradTestTrial.hpp>     // <grad(psi), b * phi>
-#include <dune/amdis/assembler/FirstOrderGradTestTrialvec.hpp>  // <grad(psi), c * Phi>
-#include <dune/amdis/assembler/FirstOrderPartialTestTrial.hpp>  // <d_i(psi), c * psi>
-#include <dune/amdis/assembler/FirstOrderTestDivTrialvec.hpp>   // <psi, c * div(Phi)>
-#include <dune/amdis/assembler/FirstOrderTestGradTrial.hpp>     // <psi, b * grad(phi)>
-#include <dune/amdis/assembler/FirstOrderTestPartialTrial.hpp>  // <psi, c * d_i(phi)>
-#include <dune/amdis/assembler/FirstOrderTestvecGradTrial.hpp>  // <Psi, c * grad(phi)>
+#include <amdis/assembler/FirstOrderDivTestvecTrial.hpp>   // <div(Psi), c * phi>
+#include <amdis/assembler/FirstOrderGradTestTrial.hpp>     // <grad(psi), b * phi>
+#include <amdis/assembler/FirstOrderGradTestTrialvec.hpp>  // <grad(psi), c * Phi>
+#include <amdis/assembler/FirstOrderPartialTestTrial.hpp>  // <d_i(psi), c * psi>
+#include <amdis/assembler/FirstOrderTestDivTrialvec.hpp>   // <psi, c * div(Phi)>
+#include <amdis/assembler/FirstOrderTestGradTrial.hpp>     // <psi, b * grad(phi)>
+#include <amdis/assembler/FirstOrderTestPartialTrial.hpp>  // <psi, c * d_i(phi)>
+#include <amdis/assembler/FirstOrderTestvecGradTrial.hpp>  // <Psi, c * grad(phi)>
 
 // second-order operators
-#include <dune/amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp>    // <div(Psi), c * div(Phi)>
-#include <dune/amdis/assembler/SecondOrderGradTestGradTrial.hpp>        // <grad(psi), A * grad(phi)>
-#include <dune/amdis/assembler/SecondOrderPartialTestPartialTrial.hpp>  // <d_i(psi), c * d_j(phi)>
+#include <amdis/assembler/SecondOrderDivTestvecDivTrialvec.hpp>    // <div(Psi), c * div(Phi)>
+#include <amdis/assembler/SecondOrderGradTestGradTrial.hpp>        // <grad(psi), A * grad(phi)>
+#include <amdis/assembler/SecondOrderPartialTestPartialTrial.hpp>  // <d_i(psi), c * d_j(phi)>
 

dune/amdis/ProblemInstat.hpp → src/amdis/ProblemInstat.hpp

@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include <dune/amdis/ProblemInstatBase.hpp>
-#include <dune/amdis/ProblemStat.hpp>
-#include <dune/amdis/common/Utility.hpp>
+#include <amdis/ProblemInstatBase.hpp>
+#include <amdis/ProblemStat.hpp>
+#include <amdis/common/Utility.hpp>
 
 namespace AMDiS
 {

dune/amdis/ProblemInstat.inc.hpp → src/amdis/ProblemInstat.inc.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include <dune/amdis/AdaptInfo.hpp>
+#include <amdis/AdaptInfo.hpp>
 
 namespace AMDiS {