From fbac8435aebcf33bcf73e2e7b212ef6f767ddf98 Mon Sep 17 00:00:00 2001
From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de>
Date: Tue, 9 Apr 2024 14:07:15 +0200
Subject: [PATCH] Refactored dynamics

---
 Model_Library                      | 2 +-
 Tooling                            | 2 +-
 examples/BusChargingDepot/runme.py | 5 ++---
 examples/BusChargingHPC/runme.py   | 5 ++---
 examples/BusChargingIMC/runme.py   | 5 ++---
 examples/complex_prosumer/runme.py | 5 ++---
 examples/district/runme.py         | 5 ++---
 examples/simple_prosumer/runme.py  | 5 ++---
 8 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Model_Library b/Model_Library
index 42e4f670c0..bfa86afea2 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 42e4f670c000b6a75caba442aded16c2036bd224
+Subproject commit bfa86afea225c34fc47815ab54113e2bdb9b86cc
diff --git a/Tooling b/Tooling
index 0e393a62c8..e5ccdd9a08 160000
--- a/Tooling
+++ b/Tooling
@@ -1 +1 @@
-Subproject commit 0e393a62c8c9b9db76304ff4a995fc868bb15a41
+Subproject commit e5ccdd9a089f59aae5de77a64877f2d46dd4c042
diff --git a/examples/BusChargingDepot/runme.py b/examples/BusChargingDepot/runme.py
index 134c922528..9be37c11c3 100644
--- a/examples/BusChargingDepot/runme.py
+++ b/examples/BusChargingDepot/runme.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from Model_Library.Prosumer.main import ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -32,8 +32,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-05-10 00:00:00")
-global_dynamic = GlobalDynamic([60 for i in range(24 * 60 - 1)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([60 for i in range(24 * 60 - 1)])
 
 input_profile_dict = {
     "bus_1_demand": {"type": "elec_demand", "file": "bus_1_demand.csv"},
diff --git a/examples/BusChargingHPC/runme.py b/examples/BusChargingHPC/runme.py
index 282bdddcc3..1d9f557359 100644
--- a/examples/BusChargingHPC/runme.py
+++ b/examples/BusChargingHPC/runme.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from Model_Library.Prosumer.main import ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -32,8 +32,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-05-10 00:00:00")
-global_dynamic = GlobalDynamic([60 for i in range(24 * 60 - 1)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([60 for i in range(24 * 60 - 1)])
 
 input_profile_dict = {
     "bus_1_demand": {"type": "elec_demand", "file": "bus_1_demand.csv"},
diff --git a/examples/BusChargingIMC/runme.py b/examples/BusChargingIMC/runme.py
index da7dd52fce..ea10a3bfe9 100644
--- a/examples/BusChargingIMC/runme.py
+++ b/examples/BusChargingIMC/runme.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from Model_Library.Prosumer.main import ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -32,8 +32,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-05-10 00:00:00")
-global_dynamic = GlobalDynamic([60 for i in range(24 * 60 - 1)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([60 for i in range(24 * 60 - 1)])
 
 input_profile_dict = {
     "bus_1_demand": {"type": "elec_demand", "file": "bus_1_demand.csv"},
diff --git a/examples/complex_prosumer/runme.py b/examples/complex_prosumer/runme.py
index d9e4eadff8..a28df32af5 100644
--- a/examples/complex_prosumer/runme.py
+++ b/examples/complex_prosumer/runme.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from Model_Library.Prosumer.main import ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -32,8 +32,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-01-01 00:00:00")
-global_dynamic = GlobalDynamic([3600 for i in range(24)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([3600 for i in range(24)])
 
 input_profile_dict = {
     "irradiance": {"type": "irradiance", "file": "irradiance.csv"},
diff --git a/examples/district/runme.py b/examples/district/runme.py
index 829420d7f1..9b9fd477a1 100644
--- a/examples/district/runme.py
+++ b/examples/district/runme.py
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 from Model_Library.District.main import DistrictMain
 from Model_Library.Prosumer.main import DistrictAssetMain, ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -33,8 +33,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-05-10 00:00:00")
-global_dynamic = GlobalDynamic([3600 for i in range(24)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([3600 for i in range(24)])
 
 input_profile_dict = {
     "irradiance": {"type": "irradiance", "file": "irradiance.csv"},
diff --git a/examples/simple_prosumer/runme.py b/examples/simple_prosumer/runme.py
index 7e7141bea6..71f57439f2 100644
--- a/examples/simple_prosumer/runme.py
+++ b/examples/simple_prosumer/runme.py
@@ -23,7 +23,7 @@ THE SOFTWARE.
 """
 
 from Model_Library.Prosumer.main import ProsumerMain
-from Model_Library.dynamics import GlobalDynamic
+from Model_Library.dynamics import TrivialDynamic
 from Tooling.input_profile_processor.input_profile_processor import (
     process_input_profiles,
 )
@@ -32,8 +32,7 @@ import json
 import pandas as pd
 
 t_start = pd.Timestamp("2019-01-01 00:00:00")
-global_dynamic = GlobalDynamic([3600 for i in range(24)])
-dynamic = global_dynamic.root()
+dynamic = TrivialDynamic([3600 for i in range(24)])
 
 input_profile_dict = {
     "irradiance": {"type": "irradiance", "file": "irradiance.csv"},
-- 
GitLab