From 08caa9669c51fb9ff1cfce9e6b18dba78cd11542 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 18 Mar 2016 13:40:41 +0100
Subject: [PATCH] [MaL] Rename CVodeSolverInternal class to CVodeSolver.
---
MathLib/ODE/CVodeSolver.cpp | 29 ++++++++++++++---------------
MathLib/ODE/CVodeSolver.h | 8 ++++----
MathLib/ODE/OdeSolverFactory.h | 4 ++--
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/MathLib/ODE/CVodeSolver.cpp b/MathLib/ODE/CVodeSolver.cpp
index 8367599e7ac..daf38d062ac 100644
--- a/MathLib/ODE/CVodeSolver.cpp
+++ b/MathLib/ODE/CVodeSolver.cpp
@@ -69,7 +69,7 @@ namespace MathLib
* |
* | Forward calls, disable bounds checking, no need for templates anymore
* v
- * Implementation = CVodeSolverInternal (no templates)
+ * Implementation = CVodeSolver (no templates)
* |
* | Pimpl (hide implementation, do not include 3rd party libs in header)
* v
@@ -300,59 +300,58 @@ CVodeSolverImpl::~CVodeSolverImpl()
}
}
-CVodeSolverInternal::CVodeSolverInternal(BaseLib::ConfigTree const& config,
- unsigned const num_equations)
+CVodeSolver::CVodeSolver(BaseLib::ConfigTree const& config,
+ unsigned const num_equations)
: _impl{new CVodeSolverImpl{config, num_equations}}
{
}
-void CVodeSolverInternal::setTolerance(const double* abstol,
- const double reltol)
+void CVodeSolver::setTolerance(const double* abstol, const double reltol)
{
_impl->setTolerance(abstol, reltol);
}
-void CVodeSolverInternal::setTolerance(const double abstol, const double reltol)
+void CVodeSolver::setTolerance(const double abstol, const double reltol)
{
_impl->setTolerance(abstol, reltol);
}
-void CVodeSolverInternal::setFunction(std::unique_ptr<FunctionHandles>&& f)
+void CVodeSolver::setFunction(std::unique_ptr<FunctionHandles>&& f)
{
_impl->setFunction(std::move(f));
}
-void CVodeSolverInternal::setIC(const double t0, double const* const y0)
+void CVodeSolver::setIC(const double t0, double const* const y0)
{
_impl->setIC(t0, y0);
}
-void CVodeSolverInternal::preSolve()
+void CVodeSolver::preSolve()
{
_impl->preSolve();
}
-void CVodeSolverInternal::solve(const double t_end)
+void CVodeSolver::solve(const double t_end)
{
_impl->solve(t_end);
}
-double const* CVodeSolverInternal::getSolution() const
+double const* CVodeSolver::getSolution() const
{
return _impl->getSolution();
}
-void CVodeSolverInternal::getYDot(const double t, double const* const y,
- double* const y_dot) const
+void CVodeSolver::getYDot(const double t, double const* const y,
+ double* const y_dot) const
{
_impl->getYDot(t, y, y_dot);
}
-double CVodeSolverInternal::getTime() const
+double CVodeSolver::getTime() const
{
return _impl->getTime();
}
-CVodeSolverInternal::~CVodeSolverInternal() = default;
+CVodeSolver::~CVodeSolver() = default;
} // namespace MathLib
diff --git a/MathLib/ODE/CVodeSolver.h b/MathLib/ODE/CVodeSolver.h
index 0661e633bb0..196492b2fed 100644
--- a/MathLib/ODE/CVodeSolver.h
+++ b/MathLib/ODE/CVodeSolver.h
@@ -24,11 +24,11 @@ class CVodeSolverImpl;
*
* For internal use only.
*/
-class CVodeSolverInternal
+class CVodeSolver
{
protected:
- CVodeSolverInternal(BaseLib::ConfigTree const& config,
- unsigned const num_equations);
+ CVodeSolver(BaseLib::ConfigTree const& config,
+ unsigned const num_equations);
void setTolerance(double const* const abstol, const double reltol);
void setTolerance(const double abstol, const double reltol);
@@ -46,7 +46,7 @@ protected:
double const* const y,
double* const y_dot) const;
- ~CVodeSolverInternal();
+ ~CVodeSolver();
private:
std::unique_ptr<CVodeSolverImpl>
diff --git a/MathLib/ODE/OdeSolverFactory.h b/MathLib/ODE/OdeSolverFactory.h
index 502750499a1..3d4d9c1af64 100644
--- a/MathLib/ODE/OdeSolverFactory.h
+++ b/MathLib/ODE/OdeSolverFactory.h
@@ -202,8 +202,8 @@ std::unique_ptr<OdeSolver<NumEquations, FunctionArguments...>> createOdeSolver(
BaseLib::ConfigTree const& config)
{
return std::unique_ptr<OdeSolver<NumEquations, FunctionArguments...>>(
- new ConcreteOdeSolver<NumEquations, CVodeSolverInternal,
- FunctionArguments...>(config));
+ new ConcreteOdeSolver<NumEquations, CVodeSolver, FunctionArguments...>(
+ config));
}
} // namespace MathLib
--
GitLab