From 496104b2a63a13be94b4fa29d6456c12c0680e57 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 19 Mar 2021 17:12:08 +0100
Subject: [PATCH] [BL] TimeInterval. Make a struct, simplifying ctor
---
BaseLib/TimeInterval.cpp | 2 +-
BaseLib/TimeInterval.h | 18 ++++--------------
...ichletBoundaryConditionWithinTimeInterval.h | 2 +-
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/BaseLib/TimeInterval.cpp b/BaseLib/TimeInterval.cpp
index 78e01e0ef8a..24494ef7bcc 100644
--- a/BaseLib/TimeInterval.cpp
+++ b/BaseLib/TimeInterval.cpp
@@ -31,6 +31,6 @@ TimeInterval createTimeInterval(ConfigTree const& config)
//! \ogs_file_param{prj__time_loop__processes__process__time_interval__end}
time_interval_config.getConfigParameter<double>("end");
- return TimeInterval(start_time, end_time);
+ return {start_time, end_time};
}
} // namespace BaseLib
diff --git a/BaseLib/TimeInterval.h b/BaseLib/TimeInterval.h
index 6380449240f..c02e46c75ea 100644
--- a/BaseLib/TimeInterval.h
+++ b/BaseLib/TimeInterval.h
@@ -20,26 +20,16 @@ class ConfigTree;
* Class for a time interval, which has a member to check whether the given time
* is in this time interval.
*/
-class TimeInterval final
+struct TimeInterval final
{
public:
- TimeInterval(const double start_time, const double end_time)
- : _start_time(start_time), _end_time(end_time)
- {
- }
-
- TimeInterval(const TimeInterval& time_inverval) = default;
-
- TimeInterval& operator=(const TimeInterval& time_inverval) = default;
-
bool contains(const double current_time) const
{
- return (current_time >= _start_time && current_time <= _end_time);
+ return (current_time >= start_time && current_time <= end_time);
}
-private:
- double _start_time;
- double _end_time;
+ double start_time;
+ double end_time;
};
TimeInterval createTimeInterval(ConfigTree const& config);
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
index 9e48c3218c3..c6e07e8efb6 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
@@ -21,7 +21,7 @@
namespace BaseLib
{
class ConfigTree;
-class TimeInterval;
+struct TimeInterval;
}
namespace MeshLib
--
GitLab