From 004065fc1237a6168f179b8b919ff06f33b41b5d Mon Sep 17 00:00:00 2001 From: guido Date: Mon, 10 Mar 2003 11:06:29 +0000 Subject: [PATCH] change name of template argument git-svn-id: https://svn.dealii.org/trunk@7289 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/solver_selector.h | 80 +++++++++++------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/deal.II/lac/include/lac/solver_selector.h b/deal.II/lac/include/lac/solver_selector.h index cc6d9fab3d..eccbb99cf5 100644 --- a/deal.II/lac/include/lac/solver_selector.h +++ b/deal.II/lac/include/lac/solver_selector.h @@ -85,7 +85,7 @@ * * @author Ralf Hartmann, 1999 */ -template > +template > class SolverSelector : public Subscriptor { public: @@ -97,7 +97,7 @@ class SolverSelector : public Subscriptor */ SolverSelector (const std::string &solvername, SolverControl &control, - VectorMemory &vectorm); + VectorMemory &vectorm); /** * Destructor @@ -113,36 +113,36 @@ class SolverSelector : public Subscriptor */ template void solve(const Matrix &A, - Vector &x, - const Vector &b, + VECTOR &x, + const VECTOR &b, const Preconditioner &precond) const; /** * Set the additional data. For more * info see the @p{Solver} class. */ - void set_data(const typename SolverRichardson + void set_data(const typename SolverRichardson ::AdditionalData &data); /** * Set the additional data. For more * info see the @p{Solver} class. */ - void set_data(const typename SolverCG + void set_data(const typename SolverCG ::AdditionalData &data); /** * Set the additional data. For more * info see the @p{Solver} class. */ - void set_data(const typename SolverBicgstab + void set_data(const typename SolverBicgstab ::AdditionalData &data); /** * Set the additional data. For more * info see the @p{Solver} class. */ - void set_data(const typename SolverGMRES + void set_data(const typename SolverGMRES ::AdditionalData &data); /** @@ -176,78 +176,78 @@ class SolverSelector : public Subscriptor * is needed in the constructor of * each @p{Solver} class. */ - SmartPointer > vector_memory; + SmartPointer > vector_memory; private: /** * Stores the additional data. */ - typename SolverRichardson::AdditionalData richardson_data; + typename SolverRichardson::AdditionalData richardson_data; /** * Stores the additional data. */ - typename SolverCG::AdditionalData cg_data; + typename SolverCG::AdditionalData cg_data; /** * Stores the additional data. */ - typename SolverBicgstab::AdditionalData bicgstab_data; + typename SolverBicgstab::AdditionalData bicgstab_data; /** * Stores the additional data. */ - typename SolverGMRES::AdditionalData gmres_data; + typename SolverGMRES::AdditionalData gmres_data; }; /* --------------------- Inline and template functions ------------------- */ -template -SolverSelector::SolverSelector(const std::string &solver_name, +template +SolverSelector::SolverSelector(const std::string &solver_name, SolverControl &control, - VectorMemory &vector_memory) : + VectorMemory &vector_memory) : solver_name(solver_name), control(&control), vector_memory(&vector_memory) {}; -template -SolverSelector::~SolverSelector() +template +SolverSelector::~SolverSelector() {}; -template +template template void -SolverSelector::solve(const Matrix &A, - Vector &x, - const Vector &b, +SolverSelector::solve(const Matrix &A, + VECTOR &x, + const VECTOR &b, const Preconditioner &precond) const { if (solver_name=="richardson") { - SolverRichardson solver(*control,*vector_memory, + SolverRichardson solver(*control,*vector_memory, richardson_data); solver.solve(A,x,b,precond); } else if (solver_name=="cg") { - SolverCG solver(*control,*vector_memory, + SolverCG solver(*control,*vector_memory, cg_data); solver.solve(A,x,b,precond); } else if (solver_name=="bicgstab") { - SolverBicgstab solver(*control,*vector_memory, + SolverBicgstab solver(*control,*vector_memory, bicgstab_data); solver.solve(A,x,b,precond); } else if (solver_name=="gmres") { - SolverGMRES solver(*control,*vector_memory, + SolverGMRES solver(*control,*vector_memory, gmres_data); solver.solve(A,x,b,precond); } @@ -256,40 +256,40 @@ SolverSelector::solve(const Matrix &A, }; -template -std::string SolverSelector::get_solver_names() +template +std::string SolverSelector::get_solver_names() { return "richardson|cg|bicgstab|gmres"; }; -template -void SolverSelector::set_data( - const typename SolverGMRES::AdditionalData &data) +template +void SolverSelector::set_data( + const typename SolverGMRES::AdditionalData &data) { gmres_data=data; } -template -void SolverSelector::set_data( - const typename SolverRichardson::AdditionalData &data) +template +void SolverSelector::set_data( + const typename SolverRichardson::AdditionalData &data) { richardson_data=data; } -template -void SolverSelector::set_data( - const typename SolverCG::AdditionalData &data) +template +void SolverSelector::set_data( + const typename SolverCG::AdditionalData &data) { cg_data=data; } -template -void SolverSelector::set_data( - const typename SolverBicgstab::AdditionalData &data) +template +void SolverSelector::set_data( + const typename SolverBicgstab::AdditionalData &data) { bicgstab_data=data; }; -- 2.39.5