From b7a89869030f1da2cf8b1acef31af52d20d9c969 Mon Sep 17 00:00:00 2001 From: julia1071 Date: Mon, 18 Nov 2024 16:29:01 +0100 Subject: [PATCH 1/2] bugfix overwriting bidirectional --- .../components/technologies/genericTechnologies/stor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adopt_net0/components/technologies/genericTechnologies/stor.py b/adopt_net0/components/technologies/genericTechnologies/stor.py index c4e030d7..48e94567 100644 --- a/adopt_net0/components/technologies/genericTechnologies/stor.py +++ b/adopt_net0/components/technologies/genericTechnologies/stor.py @@ -383,10 +383,10 @@ def init_cut_bidirectional_fix2(const, t): ) if self.flexibility_data["power_energy_ratio"] == "fixedcapacity": - b_tec.const_cut_bidirectional = pyo.Constraint( + b_tec.const_cut_bidirectional1 = pyo.Constraint( self.set_t_performance, rule=init_cut_bidirectional_fix1 ) - b_tec.const_cut_bidirectional = pyo.Constraint( + b_tec.const_cut_bidirectional2 = pyo.Constraint( self.set_t_performance, rule=init_cut_bidirectional_fix2 ) else: From 75a536b4948aa905b4da2ecf9e8ff25330485bed Mon Sep 17 00:00:00 2001 From: julia1071 Date: Mon, 18 Nov 2024 16:42:17 +0100 Subject: [PATCH 2/2] network and tech inputdata documentation --- docs/source/workflow/LoadData.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/workflow/LoadData.rst b/docs/source/workflow/LoadData.rst index 2bd64ccc..7312d491 100644 --- a/docs/source/workflow/LoadData.rst +++ b/docs/source/workflow/LoadData.rst @@ -25,7 +25,7 @@ system by setting: .. code-block:: console "existing": [], - "new": ['electricityOffshore'] + "new": ["electricityOffshore"] - Then, for each of the networks that you specify, an input data folder with that network name should be added in the corresponding folder ("existing" or @@ -88,8 +88,8 @@ system by setting: .. code-block:: console - "existing": ['WindTurbine_Onshore_1500': 2, 'Photovoltaic': 2.4], - "new": ['Storage_Battery', 'Photovoltaic', 'Furnace_NG'] + "existing": {"WindTurbine_Onshore_1500": 2, "Photovoltaic": 2.4}, + "new": ["Storage_Battery", "Photovoltaic", "Furnace_NG"] Note: For wind turbines, the capacity of one turbine is specified in the name (1500 W), and the size is an integer. Here, we thus have two 1.5MW wind turbines