From a4de513182971563b278834a7edab0ab0680af3d Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 2 Jan 2011 12:06:51 +0000
Subject: [PATCH] move boxconstraint.hh, genericvectortools.hh, and numproc.hh
from the root directory to 'common'
[[Imported from SVN: r3662]]
---
dune/solvers/Makefile.am | 2 +-
dune/solvers/common/Makefile.am | 5 ++++-
dune/solvers/{ => common}/boxconstraint.hh | 0
dune/solvers/{ => common}/genericvectortools.hh | 0
dune/solvers/{ => common}/numproc.hh | 0
dune/solvers/common/preconditioner.hh | 2 +-
dune/solvers/iterationsteps/iterationstep.hh | 2 +-
dune/solvers/iterationsteps/mmgstep.hh | 2 +-
dune/solvers/iterationsteps/multigridstep.cc | 2 +-
dune/solvers/iterationsteps/projectedblockgsstep.hh | 2 +-
dune/solvers/iterationsteps/projectedlinegsstep.hh | 2 +-
dune/solvers/iterationsteps/trustregiongsstep.hh | 2 +-
dune/solvers/solvers/iterativesolver.cc | 2 +-
dune/solvers/solvers/quadraticipopt.hh | 2 +-
dune/solvers/solvers/solver.hh | 2 +-
dune/solvers/transferoperators/mandelobsrestrictor.hh | 2 +-
dune/solvers/transferoperators/obstaclerestrictor.hh | 2 +-
17 files changed, 17 insertions(+), 14 deletions(-)
rename dune/solvers/{ => common}/boxconstraint.hh (100%)
rename dune/solvers/{ => common}/genericvectortools.hh (100%)
rename dune/solvers/{ => common}/numproc.hh (100%)
diff --git a/dune/solvers/Makefile.am b/dune/solvers/Makefile.am
index 5031b12e..eca20b37 100644
--- a/dune/solvers/Makefile.am
+++ b/dune/solvers/Makefile.am
@@ -2,6 +2,6 @@
SUBDIRS = common iterationsteps norms solvers transferoperators
dune_solversdir = $(includedir)/dune/dune-solvers
-dune_solvers_HEADERS = boxconstraint.hh numproc.hh computeenergy.hh genericvectortools.hh
+dune_solvers_HEADERS = computeenergy.hh
include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/common/Makefile.am b/dune/solvers/common/Makefile.am
index d5bd8777..dfea333e 100644
--- a/dune/solvers/common/Makefile.am
+++ b/dune/solvers/common/Makefile.am
@@ -1,7 +1,10 @@
SUBDIRS =
commondir = $(includedir)/dune/dune-solvers/common
-common_HEADERS = canignore.hh \
+common_HEADERS = boxconstraint.hh \
+ genericvectortools.hh \
+ canignore.hh \
+ numproc.hh \
permutationmanager.hh \
preconditioner.hh \
staticmatrixtools.hh
diff --git a/dune/solvers/boxconstraint.hh b/dune/solvers/common/boxconstraint.hh
similarity index 100%
rename from dune/solvers/boxconstraint.hh
rename to dune/solvers/common/boxconstraint.hh
diff --git a/dune/solvers/genericvectortools.hh b/dune/solvers/common/genericvectortools.hh
similarity index 100%
rename from dune/solvers/genericvectortools.hh
rename to dune/solvers/common/genericvectortools.hh
diff --git a/dune/solvers/numproc.hh b/dune/solvers/common/numproc.hh
similarity index 100%
rename from dune/solvers/numproc.hh
rename to dune/solvers/common/numproc.hh
diff --git a/dune/solvers/common/preconditioner.hh b/dune/solvers/common/preconditioner.hh
index d5a28c78..8daa09d7 100644
--- a/dune/solvers/common/preconditioner.hh
+++ b/dune/solvers/common/preconditioner.hh
@@ -1,7 +1,7 @@
#ifndef PRECONDITIONER_HH
#define PRECONDITIONER_HH
-#include <dune/solvers/numproc.hh>
+#include <dune/solvers/common/numproc.hh>
/** \brief Abstract base class for preconditioners
*/
diff --git a/dune/solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh
index c6333794..74e60776 100644
--- a/dune/solvers/iterationsteps/iterationstep.hh
+++ b/dune/solvers/iterationsteps/iterationstep.hh
@@ -6,7 +6,7 @@
#include <dune/common/bitsetvector.hh>
#include <dune/solvers/common/canignore.hh>
-#include <dune/solvers/numproc.hh>
+#include <dune/solvers/common/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.hh b/dune/solvers/iterationsteps/mmgstep.hh
index fc519913..add3f7e4 100644
--- a/dune/solvers/iterationsteps/mmgstep.hh
+++ b/dune/solvers/iterationsteps/mmgstep.hh
@@ -5,7 +5,7 @@
#include <dune/solvers/iterationsteps/projectedblockgsstep.hh>
#include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/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 4953fddd..394acdb9 100644
--- a/dune/solvers/iterationsteps/multigridstep.cc
+++ b/dune/solvers/iterationsteps/multigridstep.cc
@@ -2,7 +2,7 @@
#include <dune/solvers/transferoperators/multigridtransfer.hh>
#include <dune/solvers/solvers/loopsolver.hh>
-#include <dune/solvers/genericvectortools.hh>
+#include <dune/solvers/common/genericvectortools.hh>
#include "blockgsstep.hh"
#ifdef HAVE_IPOPT
diff --git a/dune/solvers/iterationsteps/projectedblockgsstep.hh b/dune/solvers/iterationsteps/projectedblockgsstep.hh
index 6a8d91cc..58f7419e 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/common/boxconstraint.hh>
template<class OperatorType, class DiscFuncType>
class ProjectedBlockGSStep : public BlockGSStep<OperatorType, DiscFuncType>
diff --git a/dune/solvers/iterationsteps/projectedlinegsstep.hh b/dune/solvers/iterationsteps/projectedlinegsstep.hh
index 2cd0c74b..d9a3e196 100755
--- a/dune/solvers/iterationsteps/projectedlinegsstep.hh
+++ b/dune/solvers/iterationsteps/projectedlinegsstep.hh
@@ -5,7 +5,7 @@
#include <dune/istl/btdmatrix.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
#include <dune/solvers/iterationsteps/linegsstep.hh>
template<class MatrixType,
diff --git a/dune/solvers/iterationsteps/trustregiongsstep.hh b/dune/solvers/iterationsteps/trustregiongsstep.hh
index df59a273..533ba8e5 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/common/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/solvers/iterativesolver.cc b/dune/solvers/solvers/iterativesolver.cc
index 67b27d1b..808b2803 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/common/genericvectortools.hh>
template <class VectorType, class BitVectorType>
void IterativeSolver<VectorType, BitVectorType>::check() const
diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh
index 9496db84..b4a0bfb5 100644
--- a/dune/solvers/solvers/quadraticipopt.hh
+++ b/dune/solvers/solvers/quadraticipopt.hh
@@ -15,7 +15,7 @@
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/bvector.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
#include <dune/solvers/common/canignore.hh>
#include <dune/solvers/solvers/iterativesolver.hh>
diff --git a/dune/solvers/solvers/solver.hh b/dune/solvers/solvers/solver.hh
index 14ead9b2..28aff314 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/common/numproc.hh>
/** \brief The base class for all sorts of solver algorithms */
class Solver : public NumProc
diff --git a/dune/solvers/transferoperators/mandelobsrestrictor.hh b/dune/solvers/transferoperators/mandelobsrestrictor.hh
index 6e347248..c22621da 100644
--- a/dune/solvers/transferoperators/mandelobsrestrictor.hh
+++ b/dune/solvers/transferoperators/mandelobsrestrictor.hh
@@ -4,7 +4,7 @@
#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/common/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 aa6edbeb..975850e6 100644
--- a/dune/solvers/transferoperators/obstaclerestrictor.hh
+++ b/dune/solvers/transferoperators/obstaclerestrictor.hh
@@ -4,7 +4,7 @@
#include <vector>
#include <dune/solvers/transferoperators/multigridtransfer.hh>
-#include <dune/solvers/boxconstraint.hh>
+#include <dune/solvers/common/boxconstraint.hh>
/** \brief Abstract base class for all obstacle restriction operators
* \todo Do we need the template parameter?
--
GitLab