Merge pull request #948 from PyPSA/fix-heatpump-lowvoltage

adjust AC bus to low voltage
This commit is contained in:
lisazeyen 2024-02-26 11:51:48 +01:00 committed by GitHub
commit a5f7b11070
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -417,6 +417,11 @@ def add_heating_capacities_installed_before_baseyear(
nodes = pd.Index(n.buses.location[n.buses.index.str.contains(f"{name} heat")]) nodes = pd.Index(n.buses.location[n.buses.index.str.contains(f"{name} heat")])
if (name_type != "central") and options["electricity_distribution_grid"]:
nodes_elec = nodes + " low voltage"
else:
nodes_elec = nodes
heat_pump_type = "air" if "urban" in name else "ground" heat_pump_type = "air" if "urban" in name else "ground"
# Add heat pumps # Add heat pumps
@ -440,7 +445,7 @@ def add_heating_capacities_installed_before_baseyear(
"Link", "Link",
nodes, nodes,
suffix=f" {name} {heat_pump_type} heat pump-{grouping_year}", suffix=f" {name} {heat_pump_type} heat pump-{grouping_year}",
bus0=nodes, bus0=nodes_elec,
bus1=nodes + " " + name + " heat", bus1=nodes + " " + name + " heat",
carrier=f"{name} {heat_pump_type} heat pump", carrier=f"{name} {heat_pump_type} heat pump",
efficiency=efficiency, efficiency=efficiency,
@ -458,7 +463,7 @@ def add_heating_capacities_installed_before_baseyear(
"Link", "Link",
nodes, nodes,
suffix=f" {name} resistive heater-{grouping_year}", suffix=f" {name} resistive heater-{grouping_year}",
bus0=nodes, bus0=nodes_elec,
bus1=nodes + " " + name + " heat", bus1=nodes + " " + name + " heat",
carrier=name + " resistive heater", carrier=name + " resistive heater",
efficiency=costs.at[f"{name_type} resistive heater", "efficiency"], efficiency=costs.at[f"{name_type} resistive heater", "efficiency"],
@ -541,6 +546,7 @@ def add_heating_capacities_installed_before_baseyear(
) )
# %%
if __name__ == "__main__": if __name__ == "__main__":
if "snakemake" not in globals(): if "snakemake" not in globals():
from _helpers import mock_snakemake from _helpers import mock_snakemake
@ -552,7 +558,7 @@ if __name__ == "__main__":
clusters="37", clusters="37",
ll="v1.0", ll="v1.0",
opts="", opts="",
sector_opts="1p7-4380H-T-H-B-I-A-dist1", sector_opts="8760-T-H-B-I-A-dist1",
planning_horizons=2020, planning_horizons=2020,
) )