diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 61f046823..000000000 Binary files a/.DS_Store and /dev/null differ diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index d4252e467..1a7d9cdc7 100755 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -2608,7 +2608,8 @@ def add_heat( ) etpr_water_tanks = costs.at[ - heat_system.central_or_decentral + " water tank storage", "energy to power ratio" + heat_system.central_or_decentral + " water tank storage", + "energy to power ratio", ] n.add( @@ -2637,9 +2638,9 @@ def add_heat( p_nom_extendable=True, ) - n.links.loc[ - nodes + f" {heat_system} water tanks charger", "etpr" - ] = etpr_water_tanks + n.links.loc[nodes + f" {heat_system} water tanks charger", "etpr"] = ( + etpr_water_tanks + ) tes_time_constant_days = options["tes_tau"][ heat_system.central_or_decentral @@ -2682,7 +2683,8 @@ def add_heat( bus0=nodes + f" {heat_system} heat", bus1=nodes + f" {heat_system} water pits", efficiency=costs.at[ - "central water pit charger", "efficiency", + "central water pit charger", + "efficiency", ], carrier=f"{heat_system} water pits charger", p_nom_extendable=True, @@ -2695,14 +2697,15 @@ def add_heat( bus1=nodes + f" {heat_system} heat", carrier=f"{heat_system} water pits discharger", efficiency=costs.at[ - "central water pit discharger", "efficiency", + "central water pit discharger", + "efficiency", ], p_nom_extendable=True, ) - n.links.loc[ - nodes + f" {heat_system} water pits charger", "etpr" - ] = etpr_water_pit + n.links.loc[nodes + f" {heat_system} water pits charger", "etpr"] = ( + etpr_water_pit + ) n.add( "Store", diff --git a/scripts/solve_network.py b/scripts/solve_network.py index d8bddd75a..4c165d3ad 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -33,10 +33,10 @@ import sys from typing import Any +import linopy import numpy as np import pandas as pd import pypsa -import linopy import xarray as xr import yaml from _benchmark import memory_logger @@ -803,7 +803,9 @@ def add_TES_etpr_constraints(n): if not n.links.p_nom_extendable.any(): return - tes_charger_bool = n.links.index.str.contains("water tanks charger|water pits charger") + tes_charger_bool = n.links.index.str.contains( + "water tanks charger|water pits charger" + ) tes_store_bool = n.stores.index.str.contains("water tanks|water pits") chargers_ext = n.links[tes_charger_bool].query("p_nom_extendable").index @@ -822,7 +824,7 @@ def add_TES_etpr_constraints(n): linear_expr_list, dim="Store-ext, Link-ext", cls=type(linear_expr_list[0]) ) - n.model.add_constraints(merged_expr == 0, name='TES_etpr') + n.model.add_constraints(merged_expr == 0, name="TES_etpr") def add_TES_charger_ratio_constraints(n): @@ -834,7 +836,9 @@ def add_TES_charger_ratio_constraints(n): if not n.links.p_nom_extendable.any(): return - discharger_bool = n.links.index.str.contains("water tanks discharger|water pits discharger") + discharger_bool = n.links.index.str.contains( + "water tanks discharger|water pits discharger" + ) charger_bool = n.links.index.str.contains("water tanks charger|water pits charger") dischargers_ext = n.links[discharger_bool].query("p_nom_extendable").index @@ -842,8 +846,8 @@ def add_TES_charger_ratio_constraints(n): eff = n.links.efficiency[dischargers_ext].values lhs = ( - n.model["Link-p_nom"].loc[chargers_ext] - - n.model["Link-p_nom"].loc[dischargers_ext] * eff + n.model["Link-p_nom"].loc[chargers_ext] + - n.model["Link-p_nom"].loc[dischargers_ext] * eff ) n.model.add_constraints(lhs == 0, name="TES_charger_ratio")