From e1e0e9bcd6ebf787939c70c909c6b9c2d6fcba63 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 13 Jan 2010 13:59:34 +0000
Subject: [PATCH] adjust include paths to new dune-solvers directory structure
[[Imported from SVN: r3137]]
---
dune/solvers/iterationsteps/amgstep.hh | 2 +-
dune/solvers/iterationsteps/istlseqilu0step.hh | 2 +-
dune/solvers/iterationsteps/iterationstep.hh | 4 ++--
dune/solvers/iterationsteps/mmgstep.cc | 8 ++++----
dune/solvers/iterationsteps/mmgstep.hh | 10 +++++-----
dune/solvers/iterationsteps/multigridstep.cc | 8 ++++----
dune/solvers/iterationsteps/multigridstep.hh | 4 ++--
dune/solvers/iterationsteps/projectedblockgsstep.hh | 2 +-
dune/solvers/iterationsteps/truncatedblockgsstep.hh | 2 +-
.../iterationsteps/truncatedsaddlepointgsstep.hh | 2 +-
dune/solvers/iterationsteps/trustregiongsstep.hh | 2 +-
dune/solvers/norms/energynorm.hh | 2 +-
dune/solvers/solvers/cgsolver.hh | 6 +++---
dune/solvers/solvers/iterativesolver.cc | 2 +-
dune/solvers/solvers/iterativesolver.hh | 4 ++--
dune/solvers/solvers/loopsolver.hh | 6 +++---
dune/solvers/solvers/quadraticipopt.hh | 6 +++---
dune/solvers/solvers/solver.hh | 2 +-
dune/solvers/solvers/tcgsolver.cc | 2 +-
dune/solvers/solvers/tcgsolver.hh | 6 +++---
dune/solvers/transferoperators/mandelobsrestrictor.cc | 2 +-
dune/solvers/transferoperators/mandelobsrestrictor.hh | 6 +++---
dune/solvers/transferoperators/obstaclerestrictor.hh | 4 ++--
src/dune_solvers.cc | 2 +-
24 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/dune/solvers/iterationsteps/amgstep.hh b/dune/solvers/iterationsteps/amgstep.hh
index 86115fe4..524fc1be 100644
--- a/dune/solvers/iterationsteps/amgstep.hh
+++ b/dune/solvers/iterationsteps/amgstep.hh
@@ -5,7 +5,7 @@
\brief A wrapper class for the ISTL AMG implementation
*/
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/istl/paamg/amg.hh>
/** \brief A wrapper class for the ISTL AMG implementation
diff --git a/dune/solvers/iterationsteps/istlseqilu0step.hh b/dune/solvers/iterationsteps/istlseqilu0step.hh
index c93d4d6a..0caa13df 100644
--- a/dune/solvers/iterationsteps/istlseqilu0step.hh
+++ b/dune/solvers/iterationsteps/istlseqilu0step.hh
@@ -7,7 +7,7 @@
#include <memory>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
#include <dune/istl/preconditioners.hh>
#include <dune/istl/operators.hh>
diff --git a/dune/solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh
index 154df55e..c6333794 100644
--- a/dune/solvers/iterationsteps/iterationstep.hh
+++ b/dune/solvers/iterationsteps/iterationstep.hh
@@ -1,12 +1,12 @@
#ifndef ITERATIONSTEP_HH
#define ITERATIONSTEP_HH
-#include <dune-solvers/numproc.hh>
#include <vector>
#include <string>
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/common/canignore.hh>
+#include <dune/solvers/common/canignore.hh>
+#include <dune/solvers/numproc.hh>
//! Base class for iteration steps being called by an iterative solver
template<class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> >
diff --git a/dune/solvers/iterationsteps/mmgstep.cc b/dune/solvers/iterationsteps/mmgstep.cc
index 958949e4..0d53f2cb 100644
--- a/dune/solvers/iterationsteps/mmgstep.cc
+++ b/dune/solvers/iterationsteps/mmgstep.cc
@@ -1,11 +1,11 @@
-#include <dune-solvers/transferoperators/truncatedmgtransfer.hh>
-#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune/solvers/transferoperators/truncatedmgtransfer.hh>
+#include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
-#include <dune-solvers/computeenergy.hh>
+#include <dune/solvers/computeenergy.hh>
#ifdef HAVE_IPOPT
-#include <dune-solvers/solvers/quadraticipopt.hh>
+#include <dune/solvers/solvers/quadraticipopt.hh>
#endif
template <class OperatorType, class DiscFuncType>
diff --git a/dune/solvers/iterationsteps/mmgstep.hh b/dune/solvers/iterationsteps/mmgstep.hh
index 9d68cf0e..9e79e89c 100644
--- a/dune/solvers/iterationsteps/mmgstep.hh
+++ b/dune/solvers/iterationsteps/mmgstep.hh
@@ -1,12 +1,12 @@
#ifndef DUNE_MONOTONE_MULTIGRID_STEP_HH
#define DUNE_MONOTONE_MULTIGRID_STEP_HH
-#include <dune-solvers/iterationsteps/multigridstep.hh>
-#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/iterationsteps/multigridstep.hh>
+#include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
-#include <dune-solvers/transferoperators/obstaclerestrictor.hh>
+#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/obstaclerestrictor.hh>
/** \brief The general monotone multigrid solver
*/
diff --git a/dune/solvers/iterationsteps/multigridstep.cc b/dune/solvers/iterationsteps/multigridstep.cc
index 1edc6273..137518de 100644
--- a/dune/solvers/iterationsteps/multigridstep.cc
+++ b/dune/solvers/iterationsteps/multigridstep.cc
@@ -1,12 +1,12 @@
#include <typeinfo>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/solvers/loopsolver.hh>
-#include <dune-solvers/genericvectortools.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/solvers/loopsolver.hh>
+#include <dune/solvers/genericvectortools.hh>
#include "blockgsstep.hh"
#ifdef HAVE_IPOPT
-#include <dune-solvers/solvers/quadraticipopt.hh>
+#include <dune/solvers/solvers/quadraticipopt.hh>
#endif
template <class OperatorType, class VectorType, class BitVectorType>
diff --git a/dune/solvers/iterationsteps/multigridstep.hh b/dune/solvers/iterationsteps/multigridstep.hh
index 720f3dcb..6dbd0161 100644
--- a/dune/solvers/iterationsteps/multigridstep.hh
+++ b/dune/solvers/iterationsteps/multigridstep.hh
@@ -4,8 +4,8 @@
#include <vector>
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
#include "lineariterationstep.hh"
diff --git a/dune/solvers/iterationsteps/projectedblockgsstep.hh b/dune/solvers/iterationsteps/projectedblockgsstep.hh
index f4582930..f07cf570 100644
--- a/dune/solvers/iterationsteps/projectedblockgsstep.hh
+++ b/dune/solvers/iterationsteps/projectedblockgsstep.hh
@@ -4,7 +4,7 @@
#include <vector>
#include "blockgsstep.hh"
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/boxconstraint.hh>
template<class OperatorType, class DiscFuncType>
class ProjectedBlockGSStep : public BlockGSStep<OperatorType, DiscFuncType>
diff --git a/dune/solvers/iterationsteps/truncatedblockgsstep.hh b/dune/solvers/iterationsteps/truncatedblockgsstep.hh
index 4d1cb464..5fdeddee 100644
--- a/dune/solvers/iterationsteps/truncatedblockgsstep.hh
+++ b/dune/solvers/iterationsteps/truncatedblockgsstep.hh
@@ -3,7 +3,7 @@
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
diff --git a/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh b/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
index 0143200a..3496ec28 100644
--- a/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
+++ b/dune/solvers/iterationsteps/truncatedsaddlepointgsstep.hh
@@ -5,7 +5,7 @@
#include <dune/common/fmatrix.hh>
#include <dune/istl/matrix.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
//! Point block Gauß-Seidel step for saddle point problems.
diff --git a/dune/solvers/iterationsteps/trustregiongsstep.hh b/dune/solvers/iterationsteps/trustregiongsstep.hh
index 6ac68d92..8ee78a78 100644
--- a/dune/solvers/iterationsteps/trustregiongsstep.hh
+++ b/dune/solvers/iterationsteps/trustregiongsstep.hh
@@ -7,7 +7,7 @@
*/
#include "projectedblockgsstep.hh"
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/boxconstraint.hh>
/** \brief A Gauss-Seidel iterator which does not assume that the functional
is convex, but which expects a bounded admissible set.
diff --git a/dune/solvers/norms/energynorm.hh b/dune/solvers/norms/energynorm.hh
index 4db27e2f..49099cd6 100644
--- a/dune/solvers/norms/energynorm.hh
+++ b/dune/solvers/norms/energynorm.hh
@@ -2,7 +2,7 @@
#define ENERGY_NORM_HH
#include "norm.hh"
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
template<class OperatorType, class DiscFuncType>
class EnergyNorm : public Norm<DiscFuncType>
diff --git a/dune/solvers/solvers/cgsolver.hh b/dune/solvers/solvers/cgsolver.hh
index 1d5e8d1b..3360d91e 100644
--- a/dune/solvers/solvers/cgsolver.hh
+++ b/dune/solvers/solvers/cgsolver.hh
@@ -1,9 +1,9 @@
#ifndef CG_SOLVER_HH
#define CG_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A conjugate gradient solver
*
diff --git a/dune/solvers/solvers/iterativesolver.cc b/dune/solvers/solvers/iterativesolver.cc
index 1837dde0..67b27d1b 100644
--- a/dune/solvers/solvers/iterativesolver.cc
+++ b/dune/solvers/solvers/iterativesolver.cc
@@ -4,7 +4,7 @@
#include <iomanip>
#include <fstream>
-#include <dune-solvers/genericvectortools.hh>
+#include <dune/solvers/genericvectortools.hh>
template <class VectorType, class BitVectorType>
void IterativeSolver<VectorType, BitVectorType>::check() const
diff --git a/dune/solvers/solvers/iterativesolver.hh b/dune/solvers/solvers/iterativesolver.hh
index 2224c206..e39c635e 100644
--- a/dune/solvers/solvers/iterativesolver.hh
+++ b/dune/solvers/solvers/iterativesolver.hh
@@ -2,8 +2,8 @@
#define ITERATIVE_SOLVER_HH
#include "solver.hh"
-#include <dune-solvers/iterationsteps/iterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/iterationsteps/iterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A generic iterative solver
*
diff --git a/dune/solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh
index 73cbee8a..c167f2c9 100644
--- a/dune/solvers/solvers/loopsolver.hh
+++ b/dune/solvers/solvers/loopsolver.hh
@@ -1,9 +1,9 @@
#ifndef LOOP_SOLVER_HH
#define LOOP_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/iterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/iterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A solver which consists of a single loop
*
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index 9d5e8031..7c095c17 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -15,9 +15,9 @@
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/bvector.hh>
-#include <dune-solvers/boxconstraint.hh>
-#include <dune-solvers/common/canignore.hh>
-#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/canignore.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
/** \todo Undef those because they clash. I think this is an IPOPT bug.
(their config.h is included by a header). */
diff --git a/dune/solvers/solvers/solver.hh b/dune/solvers/solvers/solver.hh
index 8ca66ab8..14ead9b2 100644
--- a/dune/solvers/solvers/solver.hh
+++ b/dune/solvers/solvers/solver.hh
@@ -1,7 +1,7 @@
#ifndef DUNE_SOLVER_HH
#define DUNE_SOLVER_HH
-#include <dune-solvers/numproc.hh>
+#include <dune/solvers/numproc.hh>
/** \brief The base class for all sorts of solver algorithms */
class Solver : public NumProc
diff --git a/dune/solvers/solvers/tcgsolver.cc b/dune/solvers/solvers/tcgsolver.cc
index 28133861..7ce24590 100644
--- a/dune/solvers/solvers/tcgsolver.cc
+++ b/dune/solvers/solvers/tcgsolver.cc
@@ -2,7 +2,7 @@
#include <limits>
#include <iomanip>
-#include <dune-solvers/norms/energynorm.hh>
+#include <dune/solvers/norms/energynorm.hh>
template <class MatrixType, class VectorType>
void TruncatedCGSolver<MatrixType, VectorType>::check() const
diff --git a/dune/solvers/solvers/tcgsolver.hh b/dune/solvers/solvers/tcgsolver.hh
index 99406f61..0bd03648 100644
--- a/dune/solvers/solvers/tcgsolver.hh
+++ b/dune/solvers/solvers/tcgsolver.hh
@@ -1,9 +1,9 @@
#ifndef TRUNCATED_CG_SOLVER_HH
#define TRUNCATED_CG_SOLVER_HH
-#include <dune-solvers/solvers/iterativesolver.hh>
-#include <dune-solvers/iterationsteps/lineariterationstep.hh>
-#include <dune-solvers/norms/norm.hh>
+#include <dune/solvers/solvers/iterativesolver.hh>
+#include <dune/solvers/iterationsteps/lineariterationstep.hh>
+#include <dune/solvers/norms/norm.hh>
/** \brief A truncated conjugate gradient solver
*
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.cc b/dune/solvers/transferoperators/mandelobsrestrictor.cc
index b766ecf6..2bab8b36 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.cc
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.cc
@@ -1,4 +1,4 @@
-#include <dune-solvers/transferoperators/compressedmultigridtransfer.hh>
+#include <dune/solvers/transferoperators/compressedmultigridtransfer.hh>
template <class DiscFuncType>
void MandelObstacleRestrictor<DiscFuncType>::
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh
index f691cc70..6e347248 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.hh
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.hh
@@ -2,9 +2,9 @@
#define MANDEL_OBSTACLE_RESTRICTOR_HH
#include <dune/common/bitsetvector.hh>
-#include <dune-solvers/transferoperators/obstaclerestrictor.hh>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/obstaclerestrictor.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/boxconstraint.hh>
template <class DiscFuncType>
class MandelObstacleRestrictor : public ObstacleRestrictor<DiscFuncType>
diff --git a/dune/solvers/transferoperators/obstaclerestrictor.hh b/dune/solvers/transferoperators/obstaclerestrictor.hh
index 395d52cc..aa6edbeb 100644
--- a/dune/solvers/transferoperators/obstaclerestrictor.hh
+++ b/dune/solvers/transferoperators/obstaclerestrictor.hh
@@ -3,8 +3,8 @@
#include <vector>
-#include <dune-solvers/transferoperators/multigridtransfer.hh>
-#include <dune-solvers/boxconstraint.hh>
+#include <dune/solvers/transferoperators/multigridtransfer.hh>
+#include <dune/solvers/boxconstraint.hh>
/** \brief Abstract base class for all obstacle restriction operators
* \todo Do we need the template parameter?
diff --git a/src/dune_solvers.cc b/src/dune_solvers.cc
index a9433c05..a11fd8f5 100644
--- a/src/dune_solvers.cc
+++ b/src/dune_solvers.cc
@@ -10,7 +10,7 @@ int main(int argc, char** argv)
try{
//Maybe initialize Mpi
Dune::MPIHelper& helper = Dune::MPIHelper::instance(argc, argv);
- std::cout << "Hello World! This is dune-solvers." << std::endl;
+ std::cout << "Hello World! This is dune/solvers." << std::endl;
if(Dune::MPIHelper::isFake)
std::cout<< "This is a sequential program." << std::endl;
else
--
GitLab