From 2058bb6f84cf5978d4ad872dfd16254b59b027f2 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Wed, 9 Mar 2022 13:53:15 +0100
Subject: [PATCH] [NumLib] Moved the definitions of two member functions of
TimeDiscretization to cpp file
---
NumLib/ODESolver/TimeDiscretization.cpp | 24 ++++++++++++++++++++++++
NumLib/ODESolver/TimeDiscretization.h | 21 ++-------------------
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/NumLib/ODESolver/TimeDiscretization.cpp b/NumLib/ODESolver/TimeDiscretization.cpp
index 820d9204bf0..99511caa4d3 100644
--- a/NumLib/ODESolver/TimeDiscretization.cpp
+++ b/NumLib/ODESolver/TimeDiscretization.cpp
@@ -47,4 +47,28 @@ double computeRelativeChangeFromPreviousTimestep(GlobalVector const& x,
// Only norm_x is close to zero
return norm_dx / std::numeric_limits<double>::epsilon();
}
+
+void TimeDiscretization::getXdot(GlobalVector const& x_at_new_timestep,
+ GlobalVector const& x_old,
+ GlobalVector& xdot) const
+{
+ namespace LinAlg = MathLib::LinAlg;
+
+ double const dt = getCurrentTimeIncrement();
+
+ // xdot = 1/dt * x_at_new_timestep - x_old
+ getWeightedOldX(xdot, x_old);
+ LinAlg::axpby(xdot, 1. / dt, -1.0, x_at_new_timestep);
+}
+
+void BackwardEuler::getWeightedOldX(GlobalVector& y,
+ GlobalVector const& x_old) const
+{
+ namespace LinAlg = MathLib::LinAlg;
+
+ // y = x_old / delta_t
+ LinAlg::copy(x_old, y);
+ LinAlg::scale(y, 1.0 / _delta_t);
+}
+
} // end of namespace NumLib
diff --git a/NumLib/ODESolver/TimeDiscretization.h b/NumLib/ODESolver/TimeDiscretization.h
index 2ae33459c1e..6ad98e921ce 100644
--- a/NumLib/ODESolver/TimeDiscretization.h
+++ b/NumLib/ODESolver/TimeDiscretization.h
@@ -132,16 +132,7 @@ public:
//! \f$.
void getXdot(GlobalVector const& x_at_new_timestep,
GlobalVector const& x_old,
- GlobalVector& xdot) const
- {
- namespace LinAlg = MathLib::LinAlg;
-
- double const dt = getCurrentTimeIncrement();
-
- // xdot = 1/dt * x_at_new_timestep - x_old
- getWeightedOldX(xdot, x_old);
- LinAlg::axpby(xdot, 1. / dt, -1.0, x_at_new_timestep);
- }
+ GlobalVector& xdot) const;
//! Returns \f$ x_O \f$.
virtual void getWeightedOldX(
@@ -155,7 +146,6 @@ class BackwardEuler final : public TimeDiscretization
{
public:
void setInitialState(const double t0) override { _t = t0; }
-
void nextTimestep(const double t, const double delta_t) override
{
_t = t;
@@ -165,14 +155,7 @@ public:
double getCurrentTime() const override { return _t; }
double getCurrentTimeIncrement() const override { return _delta_t; }
void getWeightedOldX(GlobalVector& y,
- GlobalVector const& x_old) const override
- {
- namespace LinAlg = MathLib::LinAlg;
-
- // y = x_old / delta_t
- LinAlg::copy(x_old, y);
- LinAlg::scale(y, 1.0 / _delta_t);
- }
+ GlobalVector const& x_old) const override;
private:
double _t = std::numeric_limits<double>::quiet_NaN(); //!< \f$ t_C \f$
--
GitLab