From 116334e077d21e072a10d6ed2b78b5c0a4e0d1f2 Mon Sep 17 00:00:00 2001 From: killian-scalian Date: Wed, 28 May 2025 09:51:00 +0200 Subject: [PATCH 1/3] update battery --- .../data/cc_configuration/battery.yaml | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/src/andromede/input_converter/data/cc_configuration/battery.yaml b/src/andromede/input_converter/data/cc_configuration/battery.yaml index eb341f53..30926d64 100644 --- a/src/andromede/input_converter/data/cc_configuration/battery.yaml +++ b/src/andromede/input_converter/data/cc_configuration/battery.yaml @@ -39,10 +39,12 @@ template: time-dependent: false scenario-dependent: false value: - type: timeseries + type: link data: - path: input/links/${area}/capacities/z_batteries_direct.txt - column: 0 #Read the first column + area_from: ${area} + area_to: z_batteries + field: capacity_direct + column: 0 operation: type: max @@ -87,9 +89,10 @@ template: time-dependent: true scenario-dependent: false value: - type: timeseries + type: thermal data: - path: input/thermal/series/z_batteries/z_batteries_batteries_${area}_1/series.txt + area: z_batteries + cluster: z_batteries_batteries_${area}_1 column: 0 operation: divide_by: reservoir_capacity @@ -98,9 +101,11 @@ template: time-dependent: true scenario-dependent: false value: - type: timeseries + type: link data: - path: input/links/${area}/capacities/z_batteries_direct.txt + area_from: ${area} + area_to: z_batteries + field: capacity_direct # peut etre properties ou capacity_indirect column: 0 operation: divide_by: injection_nominal_capacity @@ -109,9 +114,10 @@ template: time-dependent: true scenario-dependent: false value: - type: timeseries + type: thermal data: - path: input/thermal/series/${area}/${area}_batteries_inj/series.txt + area: ${area} + cluster: ${area}_batteries_inj column: 0 operation: divide_by: withdrawal_nominal_capacity @@ -120,22 +126,25 @@ template: time-dependent: true scenario-dependent: false value: - type: timeseries + type: link data: - path: input/links/${area}/capacities/z_batteries_parameters + area_from: ${area} + area_to: z_batteries + field: parameters column: 0 + connections: + - component1: battery_${area} + port1: injection_port + component2: ${area} + port2: balance_port + area-connections: #Syntax for hybrid connections: https://antares-simulator.readthedocs.io/en/latest/user-guide/solver/08-hybrid-studies/ #To handle the case of hybrid studies, where we replace complex modeling artifacts for batteries by a model. - component: battery_${area} port: injection_port area: ${area} - connections: - - component1: battery_${area} - port1: injection_port - component2: ${area} - port2: balance_port legacy-objects-to-delete: binding_constraints: From 6d86877a2911042a65970b680a54fb59eea10031 Mon Sep 17 00:00:00 2001 From: killian-scalian Date: Wed, 28 May 2025 14:59:45 +0200 Subject: [PATCH 2/3] comment changes --- .../input_converter/data/cc_configuration/battery.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/andromede/input_converter/data/cc_configuration/battery.yaml b/src/andromede/input_converter/data/cc_configuration/battery.yaml index 30926d64..7fbb16a3 100644 --- a/src/andromede/input_converter/data/cc_configuration/battery.yaml +++ b/src/andromede/input_converter/data/cc_configuration/battery.yaml @@ -93,6 +93,7 @@ template: data: area: z_batteries cluster: z_batteries_batteries_${area}_1 + field: series column: 0 operation: divide_by: reservoir_capacity @@ -118,6 +119,7 @@ template: data: area: ${area} cluster: ${area}_batteries_inj + field: series column: 0 operation: divide_by: withdrawal_nominal_capacity From 111edc8383daa1bcb195e8001f2d6c6199f3c2dd Mon Sep 17 00:00:00 2001 From: PIROT Killian Date: Wed, 28 May 2025 17:44:46 +0200 Subject: [PATCH 3/3] update battery.yaml with timeseries_file_type --- .../data/cc_configuration/battery.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/andromede/input_converter/data/cc_configuration/battery.yaml b/src/andromede/input_converter/data/cc_configuration/battery.yaml index 7fbb16a3..a679edf8 100644 --- a/src/andromede/input_converter/data/cc_configuration/battery.yaml +++ b/src/andromede/input_converter/data/cc_configuration/battery.yaml @@ -43,8 +43,8 @@ template: data: area_from: ${area} area_to: z_batteries - field: capacity_direct - column: 0 + timeseries_file_type: links_capacities_direct + column: 0 operation: type: max @@ -93,7 +93,7 @@ template: data: area: z_batteries cluster: z_batteries_batteries_${area}_1 - field: series + timeseries_file_type: series column: 0 operation: divide_by: reservoir_capacity @@ -106,7 +106,7 @@ template: data: area_from: ${area} area_to: z_batteries - field: capacity_direct # peut etre properties ou capacity_indirect + timeseries_file_type: links_capacities_direct # peut etre properties ou capacity_indirect column: 0 operation: divide_by: injection_nominal_capacity @@ -119,7 +119,7 @@ template: data: area: ${area} cluster: ${area}_batteries_inj - field: series + timeseries_file_type: series column: 0 operation: divide_by: withdrawal_nominal_capacity @@ -132,7 +132,7 @@ template: data: area_from: ${area} area_to: z_batteries - field: parameters + timeseries_file_type: links_parameters column: 0 connections: