From 31b1f2aab8688087d0419a3b48480d2e1530241c Mon Sep 17 00:00:00 2001 From: "christoph.von.oy" <christoph.von.oy@rwth-aachen.de> Date: Wed, 27 Sep 2023 16:56:49 +0200 Subject: [PATCH] Implemented GlobalDynamic --- Model_Library | 2 +- Tooling | 2 +- runme.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Model_Library b/Model_Library index 6e57b6dbd8..6f1a5b261c 160000 --- a/Model_Library +++ b/Model_Library @@ -1 +1 @@ -Subproject commit 6e57b6dbd8ccd5adfc5346ab689e005568c793cb +Subproject commit 6f1a5b261ce8387fc8490abf2c7bc7c2b8b16f25 diff --git a/Tooling b/Tooling index 3e220d972c..4570fa9134 160000 --- a/Tooling +++ b/Tooling @@ -1 +1 @@ -Subproject commit 3e220d972c875cff3025a6c19f0ea29a5c9b080c +Subproject commit 4570fa9134d7b646c79f3d4417136a3f68659587 diff --git a/runme.py b/runme.py index 986874044e..0c1bf451e2 100644 --- a/runme.py +++ b/runme.py @@ -24,7 +24,7 @@ THE SOFTWARE. import pandas as pd import Tooling.input_profile_processor.input_profile_processor -from Tooling.dynamics.Dynamic import TrivialDynamic +from Tooling.dynamics.Dynamic import GlobalDynamic import Model_Library.Prosumer.main as main_prosumer import Model_Library.District.main as main_district from enum import Enum @@ -36,7 +36,8 @@ class SimulationScope(Enum): simulation_scope = SimulationScope.DISTRICT t_start = pd.Timestamp("2019-05-10 00:00:00") # start time of simulation -dynamic = TrivialDynamic([1 for i in range(240)]) +global_dynamic = GlobalDynamic([1 for i in range(240)]) +dynamic = global_dynamic.root() input_profile_dict = {'irradiance_1': {'type': 'irradiance', 'file': 'input_files/data/irradiance/Lindenberg2006BSRN_Irradiance_60sec.csv'}, 'temperature_1': {'type': 'air_temperature', 'file': 'input_files/data/temperature/temperature.csv'}, -- GitLab