Merge pull request #890 from PyPSA/air-hp-rural

add air-sourced heat pumps to rural areas
This commit is contained in:
Fabian Neumann 2024-01-24 10:15:01 +01:00 committed by GitHub
commit da1e2862b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 20 deletions

View File

@ -28,8 +28,12 @@ Upcoming Release
* Cluster residential and services heat buses by default. Can be disabled with ``cluster_heat_buses: false``. * Cluster residential and services heat buses by default. Can be disabled with ``cluster_heat_buses: false``.
* Air-sourced heat pumps can now also be built in rural areas. Previously, only
ground-sourced heat pumps were considered for this category.
* Bugfix: Correctly read out number of solver threads from configuration file. * Bugfix: Correctly read out number of solver threads from configuration file.
PyPSA-Eur 0.9.0 (5th January 2024) PyPSA-Eur 0.9.0 (5th January 2024)
================================== ==================================

View File

@ -1803,8 +1803,9 @@ def add_heat(n, costs):
## Add heat pumps ## Add heat pumps
heat_pump_type = "air" if "urban" in name else "ground" heat_pump_types = ["air"] if "urban" in name else ["ground", "air"]
for heat_pump_type in heat_pump_types:
costs_name = f"{name_type} {heat_pump_type}-sourced heat pump" costs_name = f"{name_type} {heat_pump_type}-sourced heat pump"
efficiency = ( efficiency = (
cop[heat_pump_type][nodes[name]] cop[heat_pump_type][nodes[name]]