From 96ded07895e8081ecddf4dfa279f293f5bb47593 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Wed, 28 Nov 2018 15:28:30 +0100
Subject: [PATCH] [TimeInterval] Moved it to BaseLib
---
{NumLib/TimeStepping => BaseLib}/TimeInterval.cpp | 12 ++++++------
{NumLib/TimeStepping => BaseLib}/TimeInterval.h | 3 ---
.../time_interval/{t_end_time.md => t_end.md} | 0
.../time_interval/{t_start_time.md => t_start.md} | 0
.../BoundaryCondition/CreateBoundaryCondition.cpp | 2 +-
.../DirichletBoundaryConditionWithinTimeInterval.cpp | 6 +++---
.../DirichletBoundaryConditionWithinTimeInterval.h | 8 ++------
.../TimeIntervalDirichletBC.prj | 4 ++--
8 files changed, 14 insertions(+), 21 deletions(-)
rename {NumLib/TimeStepping => BaseLib}/TimeInterval.cpp (75%)
rename {NumLib/TimeStepping => BaseLib}/TimeInterval.h (97%)
rename Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/{t_end_time.md => t_end.md} (100%)
rename Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/{t_start_time.md => t_start.md} (100%)
diff --git a/NumLib/TimeStepping/TimeInterval.cpp b/BaseLib/TimeInterval.cpp
similarity index 75%
rename from NumLib/TimeStepping/TimeInterval.cpp
rename to BaseLib/TimeInterval.cpp
index 19ec782c50f..f8e10f155f2 100644
--- a/NumLib/TimeStepping/TimeInterval.cpp
+++ b/BaseLib/TimeInterval.cpp
@@ -15,7 +15,7 @@
#include "BaseLib/ConfigTree.h"
-namespace NumLib
+namespace BaseLib
{
std::unique_ptr<TimeInterval> createTimeInterval(
BaseLib::ConfigTree const& config)
@@ -24,13 +24,13 @@ std::unique_ptr<TimeInterval> createTimeInterval(
auto const& time_interval_config = config.getConfigSubtree("time_interval");
const double start_time =
- //! \ogs_file_param{prj__time_loop__processes__process__time_interval__start_time}
- time_interval_config.getConfigParameter<double>("start_time");
+ //! \ogs_file_param{prj__time_loop__processes__process__time_interval__start}
+ time_interval_config.getConfigParameter<double>("start");
const double end_time =
- //! \ogs_file_param{prj__time_loop__processes__process__time_interval__end_time}
- time_interval_config.getConfigParameter<double>("end_time");
+ //! \ogs_file_param{prj__time_loop__processes__process__time_interval__end}
+ time_interval_config.getConfigParameter<double>("end");
- return std::make_unique<NumLib::TimeInterval>(start_time, end_time);
+ return std::make_unique<BaseLib::TimeInterval>(start_time, end_time);
}
} // end of namespace
diff --git a/NumLib/TimeStepping/TimeInterval.h b/BaseLib/TimeInterval.h
similarity index 97%
rename from NumLib/TimeStepping/TimeInterval.h
rename to BaseLib/TimeInterval.h
index f873b1f49de..f57a7ce28ea 100644
--- a/NumLib/TimeStepping/TimeInterval.h
+++ b/BaseLib/TimeInterval.h
@@ -17,10 +17,7 @@
namespace BaseLib
{
class ConfigTree;
-}
-namespace NumLib
-{
/*!
* Class for a time interval, which has a member to check whether the given time
* is in this time interval.
diff --git a/Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_end_time.md b/Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_end.md
similarity index 100%
rename from Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_end_time.md
rename to Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_end.md
diff --git a/Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_start_time.md b/Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_start.md
similarity index 100%
rename from Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_start_time.md
rename to Documentation/ProjectFile/prj/time_loop/processes/process/time_interval/t_start.md
diff --git a/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
index 02407f68562..fa3342bdf56 100644
--- a/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/CreateBoundaryCondition.cpp
@@ -22,7 +22,7 @@
#include "PhaseFieldIrreversibleDamageOracleBoundaryCondition.h"
#include "RobinBoundaryCondition.h"
-#include "NumLib/TimeStepping/TimeInterval.h"
+#include "BaseLib/TimeInterval.h"
#ifdef OGS_USE_PYTHON
#include "Python/PythonBoundaryCondition.h"
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.cpp
index 209c787e6d4..1e355e3772e 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.cpp
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.cpp
@@ -16,10 +16,10 @@
#include "DirichletBoundaryConditionAuxiliaryFunctions.h"
#include "BaseLib/ConfigTree.h"
+#include "BaseLib/TimeInterval.h"
#include "NumLib/DOF/LocalToGlobalIndexMap.h"
#include "NumLib/IndexValueVector.h"
-#include "NumLib/TimeStepping/TimeInterval.h"
#include "ProcessLib/Parameter/Parameter.h"
#include "ProcessLib/Utils/ProcessUtils.h"
@@ -28,7 +28,7 @@ namespace ProcessLib
{
DirichletBoundaryConditionWithinTimeInterval::
DirichletBoundaryConditionWithinTimeInterval(
- std::unique_ptr<NumLib::TimeInterval> time_interval,
+ std::unique_ptr<BaseLib::TimeInterval> time_interval,
Parameter<double> const& parameter, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id)
@@ -103,7 +103,7 @@ createDirichletBoundaryConditionWithinTimeInterval(
config.peekConfigParameter<std::string>("time_interval");
return std::make_unique<DirichletBoundaryConditionWithinTimeInterval>(
- NumLib::createTimeInterval(config), param, bc_mesh, dof_table_bulk,
+ BaseLib::createTimeInterval(config), param, bc_mesh, dof_table_bulk,
variable_id, component_id);
}
diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
index 118a4e8e124..0d3c9022294 100644
--- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
+++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionWithinTimeInterval.h
@@ -19,10 +19,6 @@
namespace BaseLib
{
class ConfigTree;
-}
-
-namespace NumLib
-{
class TimeInterval;
}
@@ -36,7 +32,7 @@ class DirichletBoundaryConditionWithinTimeInterval final
{
public:
DirichletBoundaryConditionWithinTimeInterval(
- std::unique_ptr<NumLib::TimeInterval> time_interval,
+ std::unique_ptr<BaseLib::TimeInterval> time_interval,
Parameter<double> const& parameter, MeshLib::Mesh const& bc_mesh,
NumLib::LocalToGlobalIndexMap const& dof_table_bulk,
int const variable_id, int const component_id);
@@ -53,7 +49,7 @@ private:
int const _variable_id;
int const _component_id;
- std::unique_ptr<NumLib::TimeInterval> _time_interval;
+ std::unique_ptr<BaseLib::TimeInterval> _time_interval;
};
std::unique_ptr<DirichletBoundaryConditionWithinTimeInterval>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
index bad9a1db661..3e66ccb3264 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
@@ -137,8 +137,8 @@
<type>DirichletWithinTimeInterval</type>
<parameter>bc_bottom</parameter>
<time_interval>
- <start_time> 0.0 </start_time>
- <end_time> 10.0 </end_time>
+ <start> 0.0 </start>
+ <end> 10.0 </end>
</time_interval>
</boundary_condition>
</boundary_conditions>
--
GitLab