bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-heatpump-lowvoltage

Browse Source
This commit is contained in:
lisazeyen 2024-02-23 15:28:36 +01:00 committed by GitHub
commit 6b5ab53f0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -79,6 +79,8 @@ Upcoming Release
* The outputs of the rule ``retrieve_gas_infrastructure_data`` no longer * The outputs of the rule ``retrieve_gas_infrastructure_data`` no longer
marked as ``protected()`` as the download size is small. marked as ``protected()`` as the download size is small.
* Bugfix: allow modelling sector-coupled landlocked regions. (Fixed handling of offshore wind.)
PyPSA-Eur 0.10.0 (19th February 2024) PyPSA-Eur 0.10.0 (19th February 2024)
===================================== =====================================

11
rules/build_sector.smk
View File

@ -808,6 +808,14 @@ rule build_existing_heating_distribution:
"../scripts/build_existing_heating_distribution.py" "../scripts/build_existing_heating_distribution.py"
def input_profile_offwind(w):
return {
f"profile_{tech}": resources(f"profile_{tech}.nc")
for tech in ["offwind-ac", "offwind-dc"]
if (tech in config_provider("electricity", "renewable_carriers")(w))
}
rule prepare_sector_network: rule prepare_sector_network:
params: params:
time_resolution=config_provider("clustering", "temporal", "resolution_sector"), time_resolution=config_provider("clustering", "temporal", "resolution_sector"),
@ -829,6 +837,7 @@ rule prepare_sector_network:
eurostat_report_year=config_provider("energy", "eurostat_report_year"), eurostat_report_year=config_provider("energy", "eurostat_report_year"),
RDIR=RDIR, RDIR=RDIR,
input: input:
unpack(input_profile_offwind),
**rules.cluster_gas_network.output, **rules.cluster_gas_network.output,
**rules.build_gas_input_locations.output, **rules.build_gas_input_locations.output,
retro_cost=lambda w: ( retro_cost=lambda w: (
@ -882,8 +891,6 @@ rule prepare_sector_network:
if config_provider("foresight")(w) == "overnight" if config_provider("foresight")(w) == "overnight"
else resources("costs_{planning_horizons}.csv") else resources("costs_{planning_horizons}.csv")
), ),
profile_offwind_ac=resources("profile_offwind-ac.nc"),
profile_offwind_dc=resources("profile_offwind-dc.nc"),
h2_cavern=resources("salt_cavern_potentials_s{simpl}_{clusters}.csv"), h2_cavern=resources("salt_cavern_potentials_s{simpl}_{clusters}.csv"),
busmap_s=resources("busmap_elec_s{simpl}.csv"), busmap_s=resources("busmap_elec_s{simpl}.csv"),
busmap=resources("busmap_elec_s{simpl}_{clusters}.csv"), busmap=resources("busmap_elec_s{simpl}_{clusters}.csv"),

4
scripts/prepare_sector_network.py
View File

@ -453,7 +453,9 @@ def update_wind_solar_costs(n, costs):
# code adapted from pypsa-eur/scripts/add_electricity.py # code adapted from pypsa-eur/scripts/add_electricity.py
for connection in ["dc", "ac"]: for connection in ["dc", "ac"]:
tech = "offwind-" + connection tech = "offwind-" + connection
profile = snakemake.input["profile_offwind_" + connection] if tech not in n.generators.carrier.values:
continue
profile = snakemake.input["profile_offwind-" + connection]
with xr.open_dataset(profile) as ds: with xr.open_dataset(profile) as ds:
# if-statement for compatibility with old profiles # if-statement for compatibility with old profiles