Skip to content

Commit

Permalink
Remove low voltage buses only once in adjust_network
Browse files Browse the repository at this point in the history
  • Loading branch information
ClaraBuettner committed Jan 30, 2025
1 parent b759439 commit f446a42
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
24 changes: 0 additions & 24 deletions etrago/appl.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,30 +682,6 @@ def run_etrago(args, json_path):
# import network from database
etrago.build_network_from_db()

etrago.network.links.loc[
etrago.network.links.carrier.isin(
["electricity_distribution_grid", "rural_ground_heat_pump",
"rural_resistive_heater", "urban_central_air_heat_pump",
"urban_central_resistive_heater",
"urban_decentral_resistive_heater"]), "p_nom_extendable"] = False

# Temporary drop low_voltage buses in foreign countries and combine them with AC
low_voltage_buses = etrago.network.buses.loc[
etrago.network.buses.carrier == "low_voltage"].copy()
for i, row in low_voltage_buses.iterrows():
link = etrago.network.links[
(etrago.network.links.bus1==i)
&(etrago.network.links.carrier=="electricity_distribution_grid")]
new_bus = link.bus0.unique()[0]
for comp in etrago.network.iterate_components():
if "bus" in comp.df.columns:
comp.df.loc[comp.df.bus==i, "bus"] = new_bus
elif "bus0" in comp.df.columns:
comp.df.loc[comp.df.bus0==i, "bus0"] = new_bus
comp.df.loc[comp.df.bus1==i, "bus1"] = new_bus
etrago.network.remove("Bus", i)
etrago.network.mremove("Link", link.index)

# adjust network regarding eTraGo setting
etrago.adjust_network()

Expand Down
2 changes: 1 addition & 1 deletion etrago/tools/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -3161,7 +3161,7 @@ def manual_fixes_datamodel(etrago):
etrago.network.links.carrier
== "electricity_distribution_grid"
)
]
].copy()
new_bus = link.bus0.unique()[0]
for comp in etrago.network.iterate_components():
if "bus" in comp.df.columns:
Expand Down

0 comments on commit f446a42

Please sign in to comment.