diff --git a/dune/solvers/iterationsteps/iterationstep.hh b/dune/solvers/iterationsteps/iterationstep.hh index 94bf5963ac0fc88330a12949083709c5a93f2050..1e26f605d7e2b6c4d65a229c680b8cbcfd46e0ca 100644 --- a/dune/solvers/iterationsteps/iterationstep.hh +++ b/dune/solvers/iterationsteps/iterationstep.hh @@ -10,6 +10,10 @@ #include <dune/solvers/common/canignore.hh> #include <dune/solvers/common/numproc.hh> +namespace Dune { + +namespace Solvers { + //! Base class for iteration steps being called by an iterative solver template<class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> > class IterationStep : virtual public NumProc, public CanIgnore<BitVectorType> @@ -80,4 +84,12 @@ class IterationStep : virtual public NumProc, public CanIgnore<BitVectorType> VectorType* x_; }; +} // namespace Solvers + +} // namespace Dune + +// For backward compatibility: will be removed eventually + +using Dune::Solvers::IterationStep; + #endif diff --git a/dune/solvers/solvers/loopsolver.cc b/dune/solvers/solvers/loopsolver.cc index c90363c45e3ff4d50287e4f9e9127e20c5ee08c3..4f076874cf9b42d47333be5a0311fde4f8b6afe2 100644 --- a/dune/solvers/solvers/loopsolver.cc +++ b/dune/solvers/solvers/loopsolver.cc @@ -8,7 +8,7 @@ #include <dune/solvers/solvers/solver.hh> template <class VectorType, class BitVectorType> -void ::LoopSolver<VectorType, BitVectorType>::check() const +void Dune::Solvers::LoopSolver<VectorType, BitVectorType>::check() const { if (!iterationStep_) DUNE_THROW(SolverError, "You need to supply an iteration step to an iterative solver!"); @@ -20,13 +20,13 @@ void ::LoopSolver<VectorType, BitVectorType>::check() const } template <class VectorType, class BitVectorType> -void ::LoopSolver<VectorType, BitVectorType>::preprocess() +void Dune::Solvers::LoopSolver<VectorType, BitVectorType>::preprocess() { this->iterationStep_->preprocess(); } template <class VectorType, class BitVectorType> -void ::LoopSolver<VectorType, BitVectorType>::solve() +void Dune::Solvers::LoopSolver<VectorType, BitVectorType>::solve() { int i; diff --git a/dune/solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh index b81b08a3d03400824b0954f6327b9ff7c5f28d9a..41e784ef0274746efb603d0b4d2f2aa4612e65d0 100644 --- a/dune/solvers/solvers/loopsolver.hh +++ b/dune/solvers/solvers/loopsolver.hh @@ -10,6 +10,10 @@ #include <dune/solvers/common/defaultbitvector.hh> +namespace Dune { + +namespace Solvers { + /** \brief A solver which consists of a single loop * * This class basically implements a loop that calls an iteration procedure @@ -101,6 +105,14 @@ protected: int iter_; }; +} // namespace Solvers + +} // namespace Dune + +// For backward compatibility: will be removed eventually + +using Dune::Solvers::LoopSolver; + #include "loopsolver.cc" #endif