From 51257e121fc3409e94556b5b8295e0abf0ea3440 Mon Sep 17 00:00:00 2001 From: Steffen Meinecke Date: Wed, 30 Oct 2024 16:20:32 +0100 Subject: [PATCH 1/2] consider new geo data format in docstrings --- pandapower/plotting/plotly/simple_plotly.py | 2 +- pandapower/plotting/plotly/vlevel_plotly.py | 4 ++-- pandapower/toolbox/data_modification.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandapower/plotting/plotly/simple_plotly.py b/pandapower/plotting/plotly/simple_plotly.py index 4193739d7..db64ff56d 100644 --- a/pandapower/plotting/plotly/simple_plotly.py +++ b/pandapower/plotting/plotly/simple_plotly.py @@ -116,7 +116,7 @@ def simple_plotly(net, respect_switches=True, use_line_geo=None, on_map=False, **respect_switches** (bool, True) - Respect switches when artificial geodata is created **use_line_geo** (bool, True) - defines if lines patches are based on - net.line_geodata of the lines (True) or on net.bus_geodata of the connected buses (False) + net.line.geo of the lines (True) or on net.bus.geo of the connected buses (False) **on_map** (bool, False) - enables using mapbox plot in plotly. If provided geodata are not real geo-coordinates in lon/lat form, on_map will be set to False. diff --git a/pandapower/plotting/plotly/vlevel_plotly.py b/pandapower/plotting/plotly/vlevel_plotly.py index 409baf916..eda70a6e0 100644 --- a/pandapower/plotting/plotly/vlevel_plotly.py +++ b/pandapower/plotting/plotly/vlevel_plotly.py @@ -35,8 +35,8 @@ def vlevel_plotly(net, respect_switches=True, use_line_geo=None, colors_dict=Non OPTIONAL: **respect_switches** (bool, True) - Respect switches when artificial geodata is created - **use_line_geo** (bool, True) - defines if lines patches are based on net.line_geodata - of the lines (True) or on net.bus_geodata of the connected buses (False) + **use_line_geo** (bool, True) - defines if lines patches are based on net.line.geo + of the lines (True) or on net.bus.geo of the connected buses (False) *colors_dict** (dict, None) - dictionary for customization of colors for each voltage level in the form: voltage : color diff --git a/pandapower/toolbox/data_modification.py b/pandapower/toolbox/data_modification.py index a8164fedb..87e2f6b77 100644 --- a/pandapower/toolbox/data_modification.py +++ b/pandapower/toolbox/data_modification.py @@ -376,7 +376,7 @@ def create_continuous_elements_index(net, start=0, add_df_to_reindex=set()): if et in net and isinstance(net[et], pd.DataFrame): if et in ["bus_geodata", "line_geodata"]: - logger.info(et + " don't need to bo included to 'add_df_to_reindex'. It is " + + logger.info(et + " don't need to be included to 'add_df_to_reindex'. It is " + "already included by et=='" + et.split("_")[0] + "'.") else: reindex_elements(net, et, new_index) From 1058f2e182595d6be7858c0121d0b6e4a6ac4e70 Mon Sep 17 00:00:00 2001 From: Jakob Kirschner Date: Thu, 7 Nov 2024 14:10:40 +0100 Subject: [PATCH 2/2] fix bt_pu in cim series compensators --- .../converter_classes/impedance/seriesCompensatorsCim16.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py b/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py index 030e75701..824e568dd 100644 --- a/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py +++ b/pandapower/converter/cim/cim2pp/converter_classes/impedance/seriesCompensatorsCim16.py @@ -107,7 +107,7 @@ def _prepare_series_compensators_cim16(self) -> pd.DataFrame: ser_comp['gf_pu'] = 0. ser_comp['bf_pu'] = 0. ser_comp['gt_pu'] = 0. - ser_comp['bf_pu'] = 0. + ser_comp['bt_pu'] = 0. ser_comp['in_service'] = ser_comp.connected & ser_comp.connected2 ser_comp = ser_comp.rename(columns={'rdfId_Terminal': sc['t_from'], 'rdfId_Terminal2': sc['t_to'], 'rdfId': sc['o_id'], 'index_bus': 'from_bus', 'index_bus2': 'to_bus'})