Commit 1741ca28 authored by Ansgar Burchardt's avatar Ansgar Burchardt
Browse files

move a few more classes into the Dune::Solvers namespace

parent 724aaeaf

dune/solvers/common/numproc.hh

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


#include <dune/common/exceptions.hh>



namespace Dune {

namespace Solvers {



/** \brief Exception thrown by solvers */

class SolverError : public Dune::Exception {};
@@ -48,6 +51,11 @@ class SolverError : public Dune::Exception {}; 
        return lhs;

    }



} /* namespace Solvers */

} /* namespace Dune */



// For backward compatibility: will be removed eventually

using Dune::Solvers::SolverError;

using Dune::Solvers::NumProc;



#endif

dune/solvers/iterationsteps/amgstep.hh

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#include <dune/solvers/iterationsteps/lineariterationstep.hh>

#include <dune/istl/paamg/amg.hh>



namespace Dune {

namespace Solvers {



/** \brief A wrapper class for the ISTL AMG implementation

 */

template <class MatrixType, class VectorType>
@@ -106,4 +109,10 @@ void AMGStep<MatrixType,VectorType>::iterate() 
    amg_->apply(*this->x_, residual_);

}



} /* namespace Solvers */

} /* namespace Dune */



// For backward compatibility: will be removed eventually

using Dune::Solvers::AMGStep;



#endif

dune/solvers/norms/energynorm.hh

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
#include <dune/solvers/norms/norm.hh>

#include <dune/solvers/iterationsteps/lineariterationstep.hh>



namespace Dune {

namespace Solvers {



    /** \brief Vector norm induced by linear operator

     *

     *  \f$\Vert u \Vert_A = (u, Au)^{1/2}\f$
@@ -119,4 +122,10 @@ 


    };



} /* namespace Solvers */

} /* namespace Dune */



// For backward compatibility: will be removed eventually

using Dune::Solvers::EnergyNorm;



#endif

dune/solvers/norms/norm.hh

+11 −2
Original line number Diff line number Diff line 
// -*- tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-

// vi: set et ts=8 sw=4 sts=4:

#ifndef NORM_HH

#define NORM_HH

#ifndef DUNE_SOLVERS_NORMS_NORM_HH

#define DUNE_SOLVERS_NORMS_NORM_HH



namespace Dune {

namespace Solvers {



//! Abstract base for classes computing norms of discrete functions

template <class V>
@@ -30,4 +33,10 @@ class Norm { 


};



} /* namespace Solvers */

} /* namespace Dune */



// For backward compatibility: will be removed eventually

using Dune::Solvers::Norm;



#endif

dune/solvers/solvers/solver.hh

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


#include <dune/solvers/common/numproc.hh>



namespace Dune {

namespace Solvers {



/**  \brief struct to store result related information such as for example number of iterations etc.

  *

  *  \warning The interface and implementation is so far highly experimental and will change without further notice!
@@ -67,4 +70,12 @@ class Solver : public NumProc 
    private:

        SolverResult result;

};



} /* namespace Solvers */

} /* namespace Dune */



// For backward compatibility: will be removed eventually

using Dune::Solvers::Solver;

using Dune::Solvers::SolverResult;



#endif