diff --git a/dune/solvers/iterationsteps/lineariterationstep.hh b/dune/solvers/iterationsteps/lineariterationstep.hh index 7836a2b9f9525c14067c7abe6dbc49b281d1d4ef..f24443a462b16a8cdc072063fd7c74af2a6ae5e3 100644 --- a/dune/solvers/iterationsteps/lineariterationstep.hh +++ b/dune/solvers/iterationsteps/lineariterationstep.hh @@ -14,6 +14,10 @@ #include "iterationstep.hh" +namespace Dune { + +namespace Solvers { + //! Base class for iteration steps being called by an iterative linear solver template<class MatrixType, class VectorType, class BitVectorType = Dune::Solvers::DefaultBitVector_t<VectorType> > class LinearIterationStep : public IterationStep<VectorType, BitVectorType>, @@ -89,4 +93,10 @@ private: using Base::setProblem; }; +} // namespace Solvers +} // namespace Dune + +// For backward compatibility: will be removed eventually +using Dune::Solvers::LinearIterationStep; + #endif diff --git a/dune/solvers/solvers/iterativesolver.hh b/dune/solvers/solvers/iterativesolver.hh index f6b746e66d8bf34967b8c74377b334e54387959c..b0fc0d152048ab74812534f31e500b447bfd1854 100644 --- a/dune/solvers/solvers/iterativesolver.hh +++ b/dune/solvers/solvers/iterativesolver.hh @@ -9,6 +9,10 @@ #include <dune/solvers/iterationsteps/iterationstep.hh> #include <dune/solvers/norms/norm.hh> +namespace Dune { + + namespace Solvers { + /** \brief Abstract base class for iterative solvers */ template <class VectorType, class BitVectorType = Dune::BitSetVector<VectorType::block_type::dimension> > class IterativeSolver : public Solver @@ -73,6 +77,13 @@ }; + } // namespace Solvers + +} // namespace Dune + +// For backward compatibility: will be removed eventually +using Dune::Solvers::IterativeSolver; + #include "iterativesolver.cc" #endif diff --git a/dune/solvers/solvers/quadraticipopt.hh b/dune/solvers/solvers/quadraticipopt.hh index 9b87f8b860c131f31b1169b46fecc5495b6e9a64..3b9395cd4b1d215f2b4c93a43a15e4e7858528b2 100644 --- a/dune/solvers/solvers/quadraticipopt.hh +++ b/dune/solvers/solvers/quadraticipopt.hh @@ -27,6 +27,10 @@ #include "IpIpoptApplication.hpp" #include "IpSolveStatistics.hpp" +namespace Dune { + +namespace Solvers { + /** \brief Implementation class used to pipe quadratic problems to the IPOpt interior-point solver @@ -777,4 +781,11 @@ void QuadraticIPOptSolver<MatrixType,VectorType,JacobianType>::solve() DUNE_THROW(Dune::Exception, "IPOpt: Error during optimization!"); } +} // namespace Solvers + +} // namespace Dune + +// For backward compatibility: will be removed eventually +using Dune::Solvers::QuadraticIPOptSolver; + #endif